2026-09-21 09:05:10 -07:00
670 changed files with 5643 additions and 42342 deletions
--- a/.ci/Arch/Dockerfile
+++ b/.ci/Arch/Dockerfile
@ -8,13 +8,10 @@ RUN pacman --sync --refresh --sysupgrade --needed --noconfirm \
        gtest \
        mariadb-libs \
        ninja \
-        openssl \
        protobuf \
        qt6-base \
-        qt6-declarative \
        qt6-imageformats \
        qt6-multimedia \
-        qt6-shadertools \
        qt6-svg \
        qt6-tools \
        qt6-translations \
--- a/.ci/Debian12/Dockerfile
+++ b/.ci/Debian12/Dockerfile
@ -15,14 +15,11 @@ RUN apt-get update && \
        libprotobuf-dev \
        libqt6multimedia6 \
        libqt6sql6-mysql \
-        libssl-dev \
        ninja-build \
        protobuf-compiler \
-        qt6-declarative-dev \
        qt6-image-formats-plugins \
        qt6-l10n-tools \
        qt6-multimedia-dev \
-        qt6-shadertools-dev \
        qt6-svg-dev \
        qt6-tools-dev \
        qt6-tools-dev-tools \
--- a/.ci/Debian13/Dockerfile
+++ b/.ci/Debian13/Dockerfile
@ -16,14 +16,11 @@ RUN apt-get update && \
        libprotobuf-dev \
        libqt6multimedia6 \
        libqt6sql6-mysql \
-        libssl-dev \
        ninja-build \
        protobuf-compiler \
-        qt6-declarative-dev \
        qt6-image-formats-plugins \
        qt6-l10n-tools \
        qt6-multimedia-dev \
-        qt6-shadertools-dev \
        qt6-svg-dev \
        qt6-tools-dev \
        qt6-tools-dev-tools \
--- a/.ci/Fedora43/Dockerfile
+++ b/.ci/Fedora43/Dockerfile
@ -7,9 +7,8 @@ RUN dnf install -y \
        git \
        mariadb-devel \
        ninja-build \
-        openssl-devel \
        protobuf-devel \
-        qt6-{qtdeclarative,qtmultimedia,qtshadertools,qtsvg,qttools,qtwebsockets}-devel \
+        qt6-{qttools,qtsvg,qtmultimedia,qtwebsockets}-devel \
        qt6-qtimageformats \
        rpm-build \
        xz-devel \
--- a/.ci/Fedora44/Dockerfile
+++ b/.ci/Fedora44/Dockerfile
@ -7,9 +7,8 @@ RUN dnf install -y \
        git \
        mariadb-devel \
        ninja-build \
-        openssl-devel \
        protobuf-devel \
-        qt6-{qtdeclarative,qtmultimedia,qtshadertools,qtsvg,qttools,qtwebsockets}-devel \
+        qt6-{qttools,qtsvg,qtmultimedia,qtwebsockets}-devel \
        qt6-qtimageformats \
        rpm-build \
        xz-devel \
--- a/.ci/Servatrice_Debian12/Dockerfile
+++ b/.ci/Servatrice_Debian12/Dockerfile
@ -12,7 +12,6 @@ RUN apt-get update && \
        libmariadb-dev-compat \
        libprotobuf-dev \
        libqt6sql6-mysql \
-        libssl-dev \
        ninja-build \
        protobuf-compiler \
        qt6-tools-dev \
--- a/.ci/Ubuntu24.04/Dockerfile
+++ b/.ci/Ubuntu24.04/Dockerfile
@ -15,14 +15,11 @@ RUN apt-get update && \
        libprotobuf-dev \
        libqt6multimedia6 \
        libqt6sql6-mysql \
-        libssl-dev \
        ninja-build \
        protobuf-compiler \
-        qt6-declarative-dev \
        qt6-image-formats-plugins \
        qt6-l10n-tools \
        qt6-multimedia-dev \
-        qt6-shadertools-dev \
        qt6-svg-dev \
        qt6-tools-dev \
        qt6-tools-dev-tools \
--- a/.ci/Ubuntu26.04/Dockerfile
+++ b/.ci/Ubuntu26.04/Dockerfile
@ -16,14 +16,11 @@ RUN apt-get update && \
        libprotobuf-dev \
        libqt6multimedia6 \
        libqt6sql6-mysql \
-        libssl-dev \
        ninja-build \
        protobuf-compiler \
-        qt6-declarative-dev \
        qt6-image-formats-plugins \
        qt6-l10n-tools \
        qt6-multimedia-dev \
-        qt6-shadertools-dev \
        qt6-svg-dev \
        qt6-tools-dev \
        qt6-tools-dev-tools \
--- a/.ci/compile.sh
+++ b/.ci/compile.sh
@ -149,9 +149,6 @@ if [[ $MAKE_TEST ]]; then
 fi
 if [[ $USE_CCACHE ]]; then
  flags+=("-DUSE_CCACHE=1")
-  # PCH-aware caching is required or ccache refuses to cache any TU that
-  # consumes a precompiled header, silently recompiling everything on every run.
-  ccache --set-config sloppiness=pch_defines,time_macros
  if [[ $CCACHE_SIZE ]]; then
    # note, this setting persists after running the script
    ccache --max-size "$CCACHE_SIZE"
@ -327,32 +324,4 @@ if [[ $MAKE_PACKAGE ]]; then
    BUILD_DIR="$BUILD_DIR" .ci/name_build.sh "$PACKAGE_SUFFIX"
    echo "::endgroup::"
  fi
-
-  if [[ $RUNNER_OS == Windows ]]; then
-    echo "::group::Check installer for build-tree artifacts"
-    cd "$BUILD_DIR"
-    package="$(find . -maxdepth 1 -type f -name 'Cockatrice-*.exe' -print -quit)"
-    if [[ ! $package ]]; then
-      echo "::error file=$0::Could not find installer to inspect"
-      exit 1
-    fi
-    seven_zip="$(command -v 7z || true)"
-    if [[ ! $seven_zip ]]; then
-      seven_zip="/c/Program Files/7-Zip/7z.exe"
-    fi
-    if [[ ! -f $seven_zip ]]; then
-      echo "::warning file=$0::7-Zip not found, skipping installer content check"
-    else
-      echo "Inspecting $package"
-      # Fail the build if the installer contains any path left behind by the MSBuild or
-      # Qt AUTOMOC tooling (build-tree artifacts must live in the build dir, not the install)
-      if "$seven_zip" l "$package" |
-        grep -E "_autogen|\.dir[\\/]|\.tlog|(^|[\\/])x64[\\/]|(^|[\\/])\.qt[\\/]|(^|[\\/])\.qsb[\\/]|(^|[\\/])\.lupdate[\\/]|CMakeFiles"; then
-        echo "::error file=$0::Installer contains build-tree artifacts"
-        exit 1
-      fi
-      echo "Installer content is clean"
-    fi
-    echo "::endgroup::"
-  fi
 fi
--- a/.ci/release_template.md
+++ b/.ci/release_template.md
@ -12,9 +12,9 @@ Available pre-compiled binaries for installation:
   • <kbd>Windows 10+</kbd>

  <b>macOS</b>
-   • <kbd>macOS 15+</kbd> <sub><i>Sequoia</i></sub>
-   • <kbd>macOS 14+</kbd> <sub><i>Sonoma</i></sub>
-   • <kbd>macOS 13+</kbd> <sub><i>Ventura (x86)</i></sub>
+   • <kbd>macOS 15+</kbd> <sub><i>Sequoia</i></sub> <sub>Apple M</sub>
+   • <kbd>macOS 14+</kbd> <sub><i>Sonoma</i></sub> <sub>Apple M</sub>
+   • <kbd>macOS 13+</kbd> <sub><i>Ventura</i></sub> <sub>Intel</sub>

  <b>Linux</b>
   • <kbd>Ubuntu 26.04 LTS</kbd> <sub><i>Resolute Racoon</i></sub>
@ -24,10 +24,10 @@ Available pre-compiled binaries for installation:
   • <kbd>Fedora 44</kbd>
   • <kbd>Fedora 43</kbd>

-   <sub>General Linux support is available via a <kbd>flatpak</kbd> package hosted at <a href="https://flathub.org/apps/io.github.Cockatrice.cockatrice">Flathub</a> (x86 & ARM)!</sub>
-   <sub>Thanks to courtesy of @FFY00, the app is also available in <kbd>Arch Linux</kbd>'s <a href="https://archlinux.org/packages/extra/x86_64/cockatrice">official extra repository</a>.</sub>
+<sub>We are also packaged in <kbd>Arch Linux</kbd>'s <a href="https://archlinux.org/packages/extra/x86_64/cockatrice">official extra repository</a>, courtesy of @FFY00.</sub>
+<sub>General Linux support is available via a <kbd>flatpak</kbd> package at <a href="https://flathub.org/apps/io.github.Cockatrice.cockatrice">Flathub</a>!</sub>

- <sub>We maintain a <kbd>Docker</kbd> image for "Servatrice" in <a href="https://github.com/Cockatrice/Cockatrice/pkgs/container/servatrice">GHCR</a> (x86 & ARM). You can docker pull it or use our Docker Compose files!</sub>
+<sub>We provide a <kbd>Docker</kbd> image for "Servatrice" in <a href="https://github.com/Cockatrice/Cockatrice/pkgs/container/servatrice">GHCR</a>. You can docker pull it or use our Docker Compose files!</sub>
 </pre>


--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@ -1,95 +0,0 @@
-# GitHub Docs on Code Scanning:
-# https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning
-# https://docs.github.com/en/code-security/how-tos/find-and-fix-code-vulnerabilities/manage-your-configuration
-# https://docs.github.com/en/code-security/reference/code-scanning/workflow-configuration-options
-#
-# CodeQL Docs:
-# https://codeql.github.com/docs/
-
-name: CodeQL
-
-permissions:
-  contents: read
-  security-events: write    # needed to post results
-
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-
-# Cancel earlier, unfinished runs of this workflow on the same branch
-concurrency:
-  group: "${{ github.workflow }} @ ${{ github.ref_name }}"
-  cancel-in-progress: true
-
-jobs:
-  analyze:
-    name: Analyze (${{ matrix.language }})
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-        # https://codeql.github.com/docs/codeql-overview/supported-languages-and-frameworks/
-        - language: cpp
-          build-mode: manual
-        - language: actions
-          build-mode: none
-
-    steps:
-    - name: "Checkout repository"
-      uses: actions/checkout@v7
-
-    - name: "Initialize CodeQL"
-      uses: github/codeql-action/init@v4
-      with:
-        languages: ${{ matrix.language }}
-        build-mode: ${{ matrix.build-mode }}
-        # https://docs.github.com/en/code-security/reference/code-scanning/codeql/codeql-queries/c-cpp-built-in-queries
-        # https://docs.github.com/en/code-security/reference/code-scanning/codeql/codeql-queries/actions-built-in-queries
-        queries: security-extended
-        dependency-caching: true
-
-    - name: "[C++] Install dependencies"
-      if: matrix.language == 'cpp' && matrix.build-mode == 'manual'
-      shell: bash
-      env:
-        DEBIAN_FRONTEND: noninteractive
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y --no-install-recommends \
-          cmake \
-          g++ \
-          libgl-dev \
-          liblzma-dev \
-          libmariadb-dev-compat \
-          libprotobuf-dev \
-          ninja-build \
-          protobuf-compiler \
-          qt6-declarative-dev \
-          qt6-multimedia-dev \
-          qt6-shadertools-dev \
-          qt6-svg-dev \
-          qt6-tools-dev \
-          qt6-tools-dev-tools \
-          qt6-websockets-dev
-
-# Minimize dependency install
-# Add ccache usage for faster compilation, (install ccache dep, actions/cache step + append DUSE_CCACHE=1 in cmake config, CCACHE env values)
-
-    - name: "[C++] Configure CMake"
-      if: matrix.language == 'cpp' && matrix.build-mode == 'manual'
-      shell: bash
-      run: cmake -S . -B build -G Ninja -DWITH_SERVER=1 -DCMAKE_BUILD_TYPE=Release
-
-    - name: "[C++] Build application"
-      if: matrix.language == 'cpp' && matrix.build-mode == 'manual'
-      shell: bash
-      run: cmake --build build
-
-    - name: "Perform CodeQL Analysis"
-      uses: github/codeql-action/analyze@v4
-      with:
-        category: "/language:${{ matrix.language }}"
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@ -3,7 +3,7 @@ name: Build Desktop
 permissions:
  actions: write    # needed to delete entries in GHA cache (update ccache)
  attestations: write    # needed to persist the attestation.
-  contents: write    # needed for e.g. vcpkg dependency graph updates
+  contents: write
  id-token: write    # needed for signing certificate in attestation

 on:
@ -34,7 +34,7 @@ on:
      - 'vcpkg.json'
      - 'vcpkg'    # needed to match submodule bumps (gitlink)

-# Cancel earlier, unfinished runs of this workflow on the same branch (unless on tag --> release)
+# Cancel earlier, unfinished runs of this workflow on the same branch (unless on release)
 concurrency:
  group: "${{ github.workflow }} @ ${{ github.ref_name }}"
  cancel-in-progress: ${{ github.ref_type != 'tag' }}
@ -42,7 +42,7 @@ concurrency:
 jobs:
  configure:
    name: Configure
-    runs-on: ubuntu-slim    # https://github.com/actions/runner-images/blob/main/images/ubuntu-slim/ubuntu-slim-Readme.md
+    runs-on: ubuntu-slim
    outputs:
      tag: ${{ steps.configure.outputs.tag }}
      sha: ${{ steps.configure.outputs.sha }}
@ -146,13 +146,13 @@ jobs:

    name: ${{ matrix.distro }} ${{ matrix.version }}
    needs: configure
-    runs-on: ubuntu-latest    # https://github.com/actions/runner-images
+    runs-on: ubuntu-latest
    continue-on-error: ${{ matrix.allow-failure == 'yes' }}
    timeout-minutes: 70
    env:
      CACHE: ${{ github.workspace }}/.cache/${{ matrix.distro }}${{ matrix.version }}    # directory for caching docker image and ccache
      CCACHE_EVICTION_AGE: 7d
-      CCACHE_SIZE: 600M    # space of all repo is 10Gi: https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#usage-limits-and-eviction-policy
+      CCACHE_SIZE: 550M    # space of all repo is 10Gi: https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#usage-limits-and-eviction-policy
      CMAKE_GENERATOR: 'Ninja'
      NAME: ${{ matrix.distro }}${{ matrix.version }}

@ -161,11 +161,14 @@ jobs:
        uses: actions/checkout@v7

      - name: "Restore compiler cache (ccache)"
-        id: restore_ccache
+        id: ccache_restore
        uses: actions/cache/restore@v6
+        env:
+          BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
        with:
-          key: ccache-${{ matrix.distro }}${{ matrix.version }}
+          key: ccache-${{ matrix.distro }}${{ matrix.version }}-${{ env.BRANCH_NAME }}
          path: ${{ env.CACHE }}
+          restore-keys: ccache-${{ matrix.distro }}${{ matrix.version }}-

      - name: "Build ${{ matrix.distro }} ${{ matrix.version }} Docker image"
        shell: bash
@ -176,12 +179,8 @@ jobs:
        shell: bash
        run: |
          source .ci/docker.sh
-          args=()
-          [[ $GITHUB_REF == "refs/heads/master" ]] && args+=(--evict-ccache "$CCACHE_EVICTION_AGE")
-          args+=(--ccache "$CCACHE_SIZE")
-          args+=(--cmake-generator "$CMAKE_GENERATOR")
-
-          RUN --server --debug --test "${args[@]}"
+          RUN --server --debug --test --ccache "$CCACHE_SIZE" \
+            --cmake-generator "$CMAKE_GENERATOR"

      - name: "Build release package"
        id: build
@ -204,10 +203,10 @@ jobs:

      # Delete used cache to emulate a ccache update. See https://github.com/actions/cache/issues/342
      - name: "Delete remote compiler cache (ccache)"
-        if: github.ref == 'refs/heads/master' && steps.restore_ccache.outputs.cache-hit
+        if: github.ref == 'refs/heads/master' && steps.ccache_restore.outputs.cache-hit
        continue-on-error: true
        env:
-          CACHE_PRIMARY_KEY: ${{ steps.restore_ccache.outputs.cache-primary-key }}
+          CACHE_PRIMARY_KEY: ${{ steps.ccache_restore.outputs.cache-primary-key }}
          GH_TOKEN: ${{ github.token }}
        run: |
          if gh cache delete --repo "$GITHUB_REPOSITORY" "$CACHE_PRIMARY_KEY"; then
@ -218,7 +217,7 @@ jobs:
        if: github.ref == 'refs/heads/master'
        uses: actions/cache/save@v6
        with:
-          key: ${{ steps.restore_ccache.outputs.cache-primary-key }}
+          key: ${{ steps.ccache_restore.outputs.cache-primary-key }}
          path: ${{ env.CACHE }}

      - name: "Upload artifact"
@ -263,77 +262,74 @@ jobs:
      matrix:
        include:
          - os: macOS
-            target: 13    # EOL 2025-09-15
-            runner: macos-15-intel    # https://github.com/actions/runner-images/blob/main/images/macos/macos-15-Readme.md
-                                      # macos-26-intel is very slow and fails in CPack during DMG config if not increasing Finder timeout
+            target: 13
+            runner: macos-15-intel

            ccache_eviction_age: 7d
            cmake_generator: Ninja
            make_package: 1
            override_target: 13
            package_suffix: "-macOS13_Intel"
-            qt_version: 6.11.*
-            qt_modules: qtimageformats qtmultimedia qtshadertools qtwebsockets
+            qt_version: 6.11.0
+            qt_modules: qtimageformats qtmultimedia qtwebsockets
            soc: Intel
            type: Release
            use_ccache: 1
-            xcode: "26.3"
+            xcode: "16.4"

          - os: macOS
-            target: 14    # EOL 2026-??
-            runner: macos-26    # https://github.com/actions/runner-images/blob/main/images/macos/macos-26-arm64-Readme.md
+            target: 14
+            runner: macos-14

            ccache_eviction_age: 7d
            cmake_generator: Ninja
            make_package: 1
-            override_target: 14
            package_suffix: "-macOS14"
-            qt_version: 6.11.*
-            qt_modules: qtimageformats qtmultimedia qtshadertools qtwebsockets
+            qt_version: 6.11.0
+            qt_modules: qtimageformats qtmultimedia qtwebsockets
            soc: Apple
            type: Release
            use_ccache: 1
-            xcode: "26.6"
+            xcode: "15.4"

          - os: macOS
            target: 15
-            runner: macos-26    # https://github.com/actions/runner-images/blob/main/images/macos/macos-26-arm64-Readme.md
+            runner: macos-15

            ccache_eviction_age: 7d
            cmake_generator: Ninja
            make_package: 1
-            override_target: 15
            package_suffix: "-macOS15"
-            qt_version: 6.11.*
-            qt_modules: qtimageformats qtmultimedia qtshadertools qtwebsockets
+            qt_version: 6.11.0
+            qt_modules: qtimageformats qtmultimedia qtwebsockets
            soc: Apple
            type: Release
            use_ccache: 1
-            xcode: "26.6"
+            xcode: "16.4"

          - os: macOS
-            target: 26
-            runner: macos-26    # https://github.com/actions/runner-images/blob/main/images/macos/macos-26-arm64-Readme.md
+            target: 15
+            runner: macos-15

            ccache_eviction_age: 7d
            cmake_generator: Ninja
-            qt_version: 6.11.*
-            qt_modules: qtimageformats qtmultimedia qtshadertools qtwebsockets
+            qt_version: 6.11.0
+            qt_modules: qtimageformats qtmultimedia qtwebsockets
            soc: Apple
            type: Debug
            use_ccache: 1
-            xcode: "26.6"
+            xcode: "16.4"

          - os: Windows
            target: 10
-            runner: windows-2025    # https://github.com/actions/runner-images/blob/main/images/windows/Windows2025-VS2026-Readme.md
+            runner: windows-2025

            cmake_generator: "Visual Studio 18 2026"
            cmake_generator_platform: x64
            make_package: 1
            package_suffix: "-Win10"
-            qt_version: 6.11.*
-            qt_modules: qtimageformats qtmultimedia qtshadertools qtwebsockets
+            qt_version: 6.11.0
+            qt_modules: qtimageformats qtmultimedia qtwebsockets
            type: Release

    name: ${{ matrix.os }} ${{ matrix.target }}${{ matrix.soc == 'Intel' && ' Intel' || '' }}${{ matrix.type == 'Debug' && ' Debug' || '' }}
@ -342,7 +338,7 @@ jobs:
    timeout-minutes: 100
    env:
      CCACHE_DIR: ${{ github.workspace }}/.cache/
-      CCACHE_SIZE: 600M    # space of all repo is 10Gi: https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#usage-limits-and-eviction-policy
+      CCACHE_SIZE: 550M    # space of all repo is 10Gi: https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#usage-limits-and-eviction-policy

    steps:
      - name: "Checkout"
@ -352,6 +348,7 @@ jobs:

      - name: "[Windows] Add msbuild to PATH"
        if: matrix.os == 'Windows'
+        id: add-msbuild
        uses: microsoft/setup-msbuild@v3
        with:
          msbuild-architecture: x64
@ -362,54 +359,54 @@ jobs:

      - name: "[macOS] Restore compiler cache (ccache)"
        if: matrix.os == 'macOS' && matrix.use_ccache == 1
-        id: restore_ccache
+        id: ccache_restore
        uses: actions/cache/restore@v6
+        env:
+          BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
        with:
-          key: ccache-${{ matrix.runner }}_${{ matrix.override_target }}-Xcode${{ matrix.xcode }}
+          key: ccache-${{ matrix.runner }}-${{ matrix.soc }}-${{ matrix.type }}-${{ env.BRANCH_NAME }}
          path: ${{ env.CCACHE_DIR }}
+          restore-keys: ccache-${{ matrix.runner }}-${{ matrix.soc }}-${{ matrix.type }}-

-      - name: "[macOS] Install aqtinstall"
-        if: matrix.os == 'macOS'
+      - name: "Install aqtinstall"
        run: pipx install aqtinstall

      # Resolve given wildcard versions (e.g. Qt 6.6.*) to latest version via aqtinstall to avoid stale caches on new releases
-      - name: "[macOS] Resolve latest Qt from ${{ matrix.qt_version }} input"
-        if: matrix.os == 'macOS'
+      - name: "Resolve latest Qt patch version"
        env:
          QT_VERSION: ${{ matrix.qt_version }}
        id: resolve_qt_version
        shell: bash
        run: .ci/resolve_latest_aqt_qt_version.sh "$QT_VERSION"

-      - name: "[macOS] Restore thin Qt ${{ steps.resolve_qt_version.outputs.version }}"
+      - name: "[macOS] Restore thin Qt ${{ steps.resolve_qt_version.outputs.version }} libraries"
        if: matrix.os == 'macOS'
        id: restore_qt
        uses: actions/cache/restore@v6
        with:
-          key: Qt-${{ steps.resolve_qt_version.outputs.version }}-macOS-${{ matrix.soc }}-${{ matrix.qt_modules }}-thin
+          key: thin-qt-macos-${{ matrix.soc }}-${{ steps.resolve_qt_version.outputs.version }}
          path: ${{ github.workspace }}/Qt

      # Using jurplel/install-qt-action to install Qt without using brew
      # Qt build using vcpkg either just fails or takes too long to build
-      - name: "[macOS] Install fat Qt ${{ matrix.qt_version }}"
+      - name: "[macOS] Install fat Qt ${{ steps.resolve_qt_version.outputs.version }}"
        if: matrix.os == 'macOS' && steps.restore_qt.outputs.cache-hit != 'true'
        uses: jurplel/install-qt-action@v4
        with:
          cache: false
-          # cache-key-prefix: Qt
-          dir: ${{ github.workspace }}    # thinning script depends on this location
+          dir: ${{ github.workspace }}
          modules: ${{ matrix.qt_modules }}
-          version: ${{ matrix.qt_version }}
+          version: ${{ steps.resolve_qt_version.outputs.version }}

      - name: "[macOS] Create thin Qt libraries"
        if: matrix.os == 'macOS' && steps.restore_qt.outputs.cache-hit != 'true'
        run: .ci/thin_macos_qtlib.sh

      - name: "[macOS] Cache thin Qt libraries"
-        if: matrix.os == 'macOS' && steps.restore_qt.outputs.cache-hit != 'true' && github.ref == 'refs/heads/master'
+        if: matrix.os == 'macOS' && steps.restore_qt.outputs.cache-hit != 'true'
        uses: actions/cache/save@v6
        with:
-          key: ${{ steps.restore_qt.outputs.cache-primary-key }}
+          key: thin-qt-macos-${{ matrix.soc }}-${{ steps.resolve_qt_version.outputs.version }}
          path: ${{ github.workspace }}/Qt

      - name: "[Windows] Install Qt ${{ matrix.qt_version }}"
@ -418,10 +415,9 @@ jobs:
        with:
          # Qt 6.11.0 only works with aqtinstall directly from git until aqtinstall 3.4 is released
          aqtsource: git+https://github.com/miurahr/aqtinstall.git
-          cache: ${{ github.ref == 'refs/heads/master' }}
-          cache-key-prefix: Qt
+          cache: true
          modules: ${{ matrix.qt_modules }}
-          version: ${{ matrix.qt_version }}
+          version: ${{ steps.resolve_qt_version.outputs.version }}

      - name: "[Windows] Install NSIS"
        if: matrix.os == 'Windows'
@ -444,7 +440,6 @@ jobs:
          CMAKE_GENERATOR: ${{ matrix.cmake_generator }}
          CMAKE_GENERATOR_PLATFORM: ${{ matrix.cmake_generator_platform }}
          DEVELOPER_DIR: '/Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer'
-          GITHUB_TOKEN: ${{ github.token }}    # needed for vcpkg dependency graph updates, see VCPKG_FEATURE_FLAGS
          MACOS_CERTIFICATE: ${{ secrets.PROD_MACOS_CERTIFICATE }}
          MACOS_CERTIFICATE_NAME: ${{ secrets.PROD_MACOS_CERTIFICATE_NAME }}
          MACOS_CERTIFICATE_PWD: ${{ secrets.PROD_MACOS_CERTIFICATE_PWD }}
@ -453,28 +448,27 @@ jobs:
          PACKAGE_SUFFIX: '${{ matrix.package_suffix }}'
          TARGET_MACOS_VERSION: ${{ matrix.override_target }}
          USE_CCACHE: ${{ matrix.use_ccache }}
-          VCPKG_BINARY_SOURCES: "clear;files,${{ steps.vcpkg-cache.outputs.path }},${{ case(github.ref == 'refs/heads/master', 'readwrite', 'read') }}"
+          VCPKG_BINARY_SOURCES: 'clear;files,${{ steps.vcpkg-cache.outputs.path }},readwrite'
          VCPKG_DISABLE_METRICS: 1
-          VCPKG_FEATURE_FLAGS: dependencygraph
        run: .ci/compile.sh --server --test --vcpkg

      # Delete used cache to emulate a ccache update. See https://github.com/actions/cache/issues/342
      - name: "[macOS] Delete remote compiler cache (ccache)"
-        if: matrix.os == 'macOS' && matrix.use_ccache == 1 && github.ref == 'refs/heads/master' && steps.restore_ccache.outputs.cache-hit
+        if: matrix.os == 'macOS' && matrix.use_ccache == 1 && github.ref == 'refs/heads/master' && steps.ccache_restore.outputs.cache-hit
        continue-on-error: true
        env:
-          CACHE_PRIMARY_KEY: ${{ steps.restore_ccache.outputs.cache-primary-key }}
+          CACHE_PRIMARY_KEY: ${{ steps.ccache_restore.outputs.cache-primary-key }}
          GH_TOKEN: ${{ github.token }}
        run: |
          if gh cache delete --repo "$GITHUB_REPOSITORY" "$CACHE_PRIMARY_KEY"; then
            echo "Cache deleted successfully"
          fi

-      - name: "[macOS] Cache updated compiler cache (ccache)"
+      - name: "[macOS] Save updated compiler cache (ccache)"
        if: matrix.os == 'macOS' && matrix.use_ccache == 1 && github.ref == 'refs/heads/master'
        uses: actions/cache/save@v6
        with:
-          key: ${{ steps.restore_ccache.outputs.cache-primary-key }}
+          key: ${{ steps.ccache_restore.outputs.cache-primary-key }}
          path: ${{ env.CCACHE_DIR }}

      - name: "[macOS] Sign app bundle"
--- a/.github/workflows/desktop-lint.yml
+++ b/.github/workflows/desktop-lint.yml
@ -1,8 +1,5 @@
 name: Code Style (C++) 

-permissions:
-  contents: read
-
 on:
  # Push trigger not needed for linting, we do not allow direct pushes to master
  pull_request:
--- a/.github/workflows/docker-release.yml
+++ b/.github/workflows/docker-release.yml
@ -1,8 +1,8 @@
-name: Build Docker
+name: Build Docker Image

 permissions:
-  contents: read    # needed to checkout repo
-  packages: write    # needed for interacting with GHCR
+  contents: read
+  packages: write

 on:
  push:
@ -13,10 +13,7 @@ on:
      - master
    paths:
      - '.github/workflows/docker-release.yml'
-      - '.dockerignore'
      - 'Dockerfile'
-      - 'docker-compose.yml'
-      - 'docker-compose.yml.windows'
  release:
    types:
      - released    # publishing of stable releases
@ -26,38 +23,36 @@ concurrency:
  group: "${{ github.workflow }} @ ${{ github.ref_name }}"
  cancel-in-progress: ${{ github.event_name != 'release' }}

-env:
-  GHCR_IMAGE: ghcr.io/cockatrice/servatrice
-  OCI_DESCRIPTION: Server for Cockatrice, a cross-platform virtual tabletop for multiplayer card games
-  OCI_TITLE: Servatrice
-  OCI_URL: https://cockatrice.github.io/
-
 jobs:
-  # Create one platform-specific image and publish its OCI image manifest per matrix job
-  build:
-    name: "Servatrice (${{ matrix.label }})"
-    if: github.repository_owner == 'Cockatrice'
-    runs-on: ${{ matrix.runner }}
-
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - label: x86
-            platform: linux/amd64
-            runner: ubuntu-latest    # https://github.com/actions/runner-images
-
-          - label: arm
-            platform: linux/arm64
-            runner: ubuntu-24.04-arm    # https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2404-Arm64-Readme.md, replace with "ubuntu-latest-arm" once available
-
-    env:
-      CACHE_SCOPE: servatrice-${{ matrix.label }}
-
+  docker:
+    name: amd64 & arm64
+    if: ${{ github.repository_owner == 'Cockatrice' }}
+    runs-on: ubuntu-latest
+  
    steps:
      - name: "Checkout"
        uses: actions/checkout@v7

+      - name: "Docker metadata"
+        id: metadata
+        uses: docker/metadata-action@v6
+        env:
+          DOCKER_METADATA_ANNOTATIONS_LEVELS: index    # needed for GHCR
+        with:
+          annotations: |
+            org.opencontainers.image.title=Servatrice
+            org.opencontainers.image.url=https://cockatrice.github.io/
+            org.opencontainers.image.description=Server for Cockatrice, a cross-platform virtual tabletop for multiplayer card games
+          images: |
+            ghcr.io/cockatrice/servatrice
+          labels: |
+            org.opencontainers.image.title=Servatrice
+            org.opencontainers.image.url=https://cockatrice.github.io/
+            org.opencontainers.image.description=Server for Cockatrice, a cross-platform virtual tabletop for multiplayer card games
+
+      - name: "Set up QEMU"
+        uses: docker/setup-qemu-action@v4
+
      - name: "Set up Docker buildx"
        uses: docker/setup-buildx-action@v4

@ -66,117 +61,18 @@ jobs:
        id: login
        uses: docker/login-action@v4
        with:
+          password: ${{ github.token }}
          registry: ghcr.io
          username: ${{ github.actor }}
-          password: ${{ github.token }}

-      # Don't push for non-release triggers
-      - name: "Build image"
-        if: steps.login.outcome != 'success'
+      - name: "Build and push Docker image"
        uses: docker/build-push-action@v7
        with:
-          cache-from: type=gha,scope=${{ env.CACHE_SCOPE }}
-          cache-to: ${{ case(github.ref == 'refs/heads/master', format('type=gha,mode=max,scope={0}', env.CACHE_SCOPE), '') }}
+          annotations: ${{ steps.metadata.outputs.annotations }}
+          cache-from: type=gha,scope=servatrice
+          cache-to: type=gha,mode=max,scope=servatrice
          context: .
-          platforms: ${{ matrix.platform }}
-          push: false
-
-      # Add OCI labels and push single-platform image by digest (without tags)
-      - name: "Build image and push by digest"
-        if: steps.login.outcome == 'success'
-        id: build
-        uses: docker/build-push-action@v7
-        with:
-          cache-from: type=gha,scope=${{ env.CACHE_SCOPE }}
-          cache-to: type=gha,mode=max,scope=${{ env.CACHE_SCOPE }}
-          context: .
-          labels: |
-            org.opencontainers.image.description=${{ env.OCI_DESCRIPTION }}
-            org.opencontainers.image.title=${{ env.OCI_TITLE }}
-            org.opencontainers.image.url=${{ env.OCI_URL }}
-          outputs: type=image,name=${{ env.GHCR_IMAGE }},name-canonical=true,push=true,push-by-digest=true
-          platforms: ${{ matrix.platform }}
-          provenance: mode=max    # Do not pass secrets as build arguments with this option
-          sbom: true
-
-      - name: "Export digest"
-        if: steps.login.outcome == 'success'
-        env:
-          DIGEST: ${{ steps.build.outputs.digest }}
-        run: |
-          mkdir -p "$RUNNER_TEMP/digests"
-          touch "$RUNNER_TEMP/digests/${DIGEST#sha256:}"
-
-      - name: "Upload digest"
-        if: steps.login.outcome == 'success'
-        uses: actions/upload-artifact@v7
-        with:
-          archive: false
-          if-no-files-found: error
-          name: digest-${{ matrix.label }}
-          path: ${{ runner.temp }}/digests/*
-          retention-days: 1
-
-
-  # Create an OCI image index from the platform-specific image manifests
-  index:
-    name: "Publish multi-platform Servatrice image"
-    if: github.repository_owner == 'Cockatrice' && github.event_name == 'release' && github.event.release.prerelease == false
-    needs: build
-    runs-on: ubuntu-slim    # https://github.com/actions/runner-images/blob/main/images/ubuntu-slim/ubuntu-slim-Readme.md
-
-    steps:
-      - name: "Download digests"
-        uses: actions/download-artifact@v8
-        with:
-          path: ${{ runner.temp }}/digests
-          pattern: digest-*
-          merge-multiple: true
-
-      - name: "Login to GitHub Container Registry (GHCR)"
-        uses: docker/login-action@v4
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ github.token }}
-
-      - name: "Docker metadata"
-        id: metadata
-        uses: docker/metadata-action@v6
-        with:
-          images: ${{ env.GHCR_IMAGE }}
-          flavor: |
-            latest=auto
-          tags: |
-            type=ref,event=tag    # if semver, also: type=semver,pattern={{version}} / {{major}}.{{minor}}
-
-      # Add OCI annotations to image index and publish tags
-      - name: "Create image index"
-        env:
-          DOCKER_TAGS: ${{ steps.metadata.outputs.tags }}
-        working-directory: ${{ runner.temp }}/digests
-        run: |
-          TAG_ARGS=()
-          while IFS= read -r tag; do
-            TAG_ARGS+=(--tag "$tag")
-          done <<< "$DOCKER_TAGS"
-
-          DIGEST_ARGS=()
-          for digest in *; do
-            DIGEST_ARGS+=("$GHCR_IMAGE@sha256:$digest")
-          done
-
-          docker buildx imagetools create \
-            --prefer-index=true \
-            --annotation "index:org.opencontainers.image.description=$OCI_DESCRIPTION" \
-            --annotation "index:org.opencontainers.image.title=$OCI_TITLE" \
-            --annotation "index:org.opencontainers.image.url=$OCI_URL" \
-            "${TAG_ARGS[@]}" \
-            "${DIGEST_ARGS[@]}"
-
-      - name: "Inspect images"
-        env:
-          GITHUB_TAG: ${{ github.ref_name }}
-        run: |
-          docker buildx imagetools inspect "$GHCR_IMAGE:latest"
-          docker buildx imagetools inspect "$GHCR_IMAGE:$GITHUB_TAG"
+          labels: ${{ steps.metadata.outputs.labels }}
+          platforms: linux/amd64,linux/arm64
+          push: ${{ steps.login.outcome == 'success' }}
+          tags: ${{ steps.metadata.outputs.tags }}
--- a/.github/workflows/documentation-build.yml
+++ b/.github/workflows/documentation-build.yml
@ -1,8 +1,5 @@
 name: Generate Docs

-permissions:
-  contents: read    # write permission to the destination repo come from 'deploy_key'
-
 on:
  pull_request:
    paths:
@ -14,11 +11,6 @@ on:
      - published    # publishing of stable releases and pre-releases
  workflow_dispatch:

-# Cancel earlier, unfinished runs of this workflow on the same branch (unless on release)
-concurrency:
-  group: "${{ github.workflow }} @ ${{ github.ref_name }}"
-  cancel-in-progress: ${{ github.event_name != 'release' }}
-
 env:
  COCKATRICE_REF: ${{ github.ref_name }}    # tag name if the commit is tagged, otherwise branch name

--- a/.github/workflows/translations-pull.yml
+++ b/.github/workflows/translations-pull.yml
@ -1,9 +1,5 @@
 name: Update Translations

-permissions:
-  contents: read
-  pull-requests: write
-
 on:
  pull_request:
    paths:
--- a/.github/workflows/translations-push.yml
+++ b/.github/workflows/translations-push.yml
@ -1,9 +1,5 @@
 name: Update Translation Source

-permissions:
-  contents: read
-  pull-requests: write
-
 on:
  pull_request:
    paths:
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -5,23 +5,23 @@
 # This file sets all the variables shared between the projects
 # like the installation path, compilation flags etc..

-# 3.16 required for Qt6 and target_precompile_headers()
-cmake_minimum_required(VERSION 3.16)
+# cmake 3.16 is required if using qt6
+cmake_minimum_required(VERSION 3.10)

-# Use compiler cache (ccache)
+# Early detect ccache
 option(USE_CCACHE "Cache the build results with ccache" ON)
 # Treat warnings as errors (Debug builds only)
 option(WARNING_AS_ERROR "Treat warnings as errors in debug builds" ON)
 # Check for translation updates
 option(UPDATE_TRANSLATIONS "Update translations on compile" OFF)
-# Compile Cockatrice
-option(WITH_CLIENT "Build Cockatrice client" ON)
-# Compile Oracle
-option(WITH_ORACLE "Build Cockatrice card database tool (Oracle)" ON)
-# Compile Servatrice
-option(WITH_SERVER "Build Cockatrice server (Servatrice)" OFF)
+# Compile servatrice
+option(WITH_SERVER "build servatrice" OFF)
+# Compile cockatrice
+option(WITH_CLIENT "build cockatrice" ON)
+# Compile oracle
+option(WITH_ORACLE "build oracle" ON)
 # Compile tests
-option(TEST "Build tests" OFF)
+option(TEST "build tests" OFF)
 # Use vcpkg regardless of OS
 option(USE_VCPKG "Use vcpkg regardless of OS" OFF)

@ -39,24 +39,13 @@ else()
  )
 endif()

-# ccache does not support MSVC and must not auto-engage on Windows
-# (it is installed unintentionally on the Windows CI runner).
-# NOTE: this keys off the target OS, so a mingw/Ninja configuration on Windows
-# also opts out of ccache even though the GNUCXX branch below supports it.
-if(USE_CCACHE AND NOT WIN32)
+if(USE_CCACHE)
  find_program(CCACHE_PROGRAM ccache)
  if(CCACHE_PROGRAM)
    # Support Unix Makefiles and Ninja
    set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
-    # PCH-aware caching, matching .ci/compile.sh: without this ccache refuses
-    # to cache any TU that consumes a precompiled header, so every PCH-backed
-    # target recompiles from scratch on each build.
-    execute_process(COMMAND ${CCACHE_PROGRAM} --set-config sloppiness=pch_defines,time_macros)
    message(STATUS "Found CCache ${CCACHE_PROGRAM}")
  endif()
-elseif(USE_CCACHE AND WIN32)
-  # An explicit opt-in must not disappear silently on Windows.
-  message(STATUS "ccache disabled: not supported for the MSVC toolchain on Windows")
 endif()

 if(WIN32 OR USE_VCPKG)
@ -195,9 +184,6 @@ elseif(CMAKE_COMPILER_IS_GNUCXX)
      set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${FLAG}")
    endif()
  endforeach()
-
-  # Reduce compiler I/O by using pipes between stages instead of temp files
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe")
 else()
  # other: osx/llvm, bsd/llvm
  set(CMAKE_CXX_FLAGS_RELEASE "-O2")
@ -206,9 +192,6 @@ else()
  else()
    set(CMAKE_CXX_FLAGS_DEBUG "-g -O0 -Wall -Wextra")
  endif()
-
-  # Reduce compiler I/O by using pipes between stages instead of temp files
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe")
 endif()

 # GNU systems need to define the Mersenne exponent for the RNG to compile w/o warning
@ -256,6 +239,11 @@ if(WIN32)
  find_package(OpenSSL REQUIRED)
  if(OPENSSL_FOUND)
    include_directories(${OPENSSL_INCLUDE_DIRS})
+  else()
+    message(
+      WARNING
+        "Could not find OpenSSL runtime libraries. They are not required for compiling, but needs to be available at runtime."
+    )
  endif()
 endif()

@ -293,7 +281,7 @@ if(UNIX)
    if(CPACK_GENERATOR STREQUAL "RPM")
      set(CPACK_RPM_PACKAGE_LICENSE "GPLv2")
      set(CPACK_RPM_MAIN_COMPONENT "cockatrice")
-      set(CPACK_RPM_PACKAGE_REQUIRES "protobuf, qt6-qtimageformats, qt6-qtmultimedia, qt6-qtsvg, qt6-qttools")
+      set(CPACK_RPM_PACKAGE_REQUIRES "protobuf, qt6-qttools, qt6-qtsvg, qt6-qtmultimedia, qt6-qtimageformats")
      set(CPACK_RPM_PACKAGE_GROUP "Amusements/Games")
      set(CPACK_RPM_PACKAGE_URL "http://github.com/Cockatrice/Cockatrice")
      # stop directories from making package conflicts
@ -311,7 +299,7 @@ if(UNIX)
      set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
      set(CPACK_DEBIAN_PACKAGE_SECTION "games")
      set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "http://github.com/Cockatrice/Cockatrice")
-      set(CPACK_DEBIAN_PACKAGE_DEPENDS "libqt6multimedia6, libqt6svg6, qt6-image-formats-plugins, qt6-qpa-plugins")
+      set(CPACK_DEBIAN_PACKAGE_DEPENDS "libqt6multimedia6, libqt6svg6, qt6-qpa-plugins, qt6-image-formats-plugins")
      set(CPACK_DEBIAN_PACKAGE_RECOMMENDS "libqt6sql6-mysql") # for connecting servatrice to a mysql db
    endif()
  endif()
--- a/54
+++ b/54
@ -3,47 +3,35 @@ FROM ubuntu:26.04 AS build

 ARG DEBIAN_FRONTEND=noninteractive

-RUN apt-get update \
-    && apt-get install -y --no-install-recommends \
-      build-essential \
-      cmake \
-      ninja-build \
-      file \
-      g++ \
-      git \
-      libmariadb-dev-compat \
-      libprotobuf-dev \
-      libqt6sql6-mysql \
-      libssl-dev \
-      qt6-websockets-dev \
-      protobuf-compiler \
-      qt6-tools-dev \
-      qt6-tools-dev-tools
+RUN apt-get update && apt-get install -y --no-install-recommends \
+  build-essential \
+  cmake \
+  file \
+  g++ \
+  git \
+  libmariadb-dev-compat \
+  libprotobuf-dev \
+  libqt6sql6-mysql \
+  qt6-websockets-dev \
+  protobuf-compiler \
+  qt6-tools-dev \
+  qt6-tools-dev-tools

 WORKDIR /src
 COPY . .
-RUN cmake \
-      -S . \
-      -B build \
-      -G Ninja \
-      -DWITH_CLIENT=0 \
-      -DWITH_ORACLE=0 \
-      -DWITH_SERVER=1 \
-    && cmake --build build \
-    && cmake --install build
+RUN mkdir build && cd build && \
+    cmake .. -DWITH_SERVER=1 -DWITH_CLIENT=0 -DWITH_ORACLE=0 && \
+    make -j$(nproc) && \
+    make install


 # -------- Runtime Stage (clean) --------
 FROM ubuntu:26.04

-ARG DEBIAN_FRONTEND=noninteractive
-
-RUN apt-get update \
-    && apt-get install -y --no-install-recommends \
-      libprotobuf32t64 \
-      libqt6sql6-mysql \
-      libqt6websockets6 \
-      libssl3 \
+RUN apt-get update && apt-get install -y --no-install-recommends \
+  libprotobuf32t64 \
+  libqt6sql6-mysql \
+  libqt6websockets6 \
    && apt-get clean \
    && rm -rf /var/lib/apt/lists/*

--- a/README.md
+++ b/README.md
@ -149,15 +149,15 @@ You can then
 <br>

 The following flags (with their non-default values) can be passed to `cmake`:
-| Flag                       | Description                                                                                                                                   |
-| -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------- |
-| `-DWITH_SERVER=1`          | Build <kbd>Servatrice</kbd> server                                                                                                            |
-| `-DWITH_CLIENT=0`          | Don't build <kbd>Cockatrice</kbd> client                                                                                                      |
-| `-DWITH_ORACLE=0`          | Don't build <kbd>Oracle</kbd> card database tool                                                                                              |
-| `-DCMAKE_BUILD_TYPE=Debug` | Compile in debug mode<br> Enables extra logging output, debug symbols, and much more verbose compiler warnings                                |
-| `-DWARNING_AS_ERROR=0`     | Don't treat compilation warnings as errors in debug mode                                                                                      |
-| `-DUPDATE_TRANSLATIONS=1`  |  Configure `make` to update the translation .ts files for new strings in the source code<br> **Note:** `make clean` will remove the .ts files |
-| `-DTEST=1`                 | Enable regression tests<br> **Note:** `make test` to run tests, *googletest* will be downloaded if not available                              |
+| Flag | Description |
+| --- | --- |
+| `-DWITH_SERVER=1` | Build <kbd>Servatrice</kbd> server |
+| `-DWITH_CLIENT=0` | Don't build <kbd>Cockatrice</kbd> client |
+| `-DWITH_ORACLE=0` | Don't build <kbd>Oracle</kbd> card database tool |
+| `-DCMAKE_BUILD_TYPE=Debug` | Compile in debug mode<br> Enables extra logging output, debug symbols, and much more verbose compiler warnings |
+| `-DWARNING_AS_ERROR=0` | Don't treat compilation warnings as errors in debug mode |
+| `-DUPDATE_TRANSLATIONS=1` |  Configure `make` to update the translation .ts files for new strings in the source code<br> **Note:** `make clean` will remove the .ts files |
+| `-DTEST=1` | Enable regression tests<br> **Note:** `make test` to run tests, *googletest* will be downloaded if not available |


 # Run
--- a/cmake/FindQtRuntime.cmake
+++ b/cmake/FindQtRuntime.cmake
@ -18,17 +18,14 @@ if(WITH_CLIENT)
      Multimedia
      Network
      PrintSupport
-      ShaderTools
      Svg
      WebSockets
      Widgets
      Xml
-      Quick
-      QuickWidgets
  )
 endif()
 if(WITH_ORACLE)
-  set(_ORACLE_NEEDED Concurrent Network Svg Widgets Xml)
+  set(_ORACLE_NEEDED Concurrent Network Svg Widgets)
 endif()
 if(TEST)
  # Union of Qt modules required across all test targets (independent of application targets).
--- a/cmake/NSIS.template.in
+++ b/cmake/NSIS.template.in
@ -387,14 +387,19 @@ SectionEnd

 Section "un.Application" UnSecApplication
 	SetShellVarContext all
+	RMDir /r "$INSTDIR\plugins"
+	RMDir /r "$INSTDIR\sounds"
+	RMDir /r "$INSTDIR\themes"
+	RMDir /r "$INSTDIR\translations"
+	Delete "$INSTDIR\*.exe"
+	Delete "$INSTDIR\*.dll"
+	Delete "$INSTDIR\qt.conf"
+	Delete "$INSTDIR\qdebug.txt"
+	Delete "$INSTDIR\servatrice.sql"
+	Delete "$INSTDIR\servatrice.ini.example"
+	RMDir "$INSTDIR"

-	; Remove the entire application directory so any file that is not part of
-	; the installed payload (e.g. build-tree artifacts such as *.dir folders,
-	; *_autogen and *.tlog files from a build) cannot survive between an
-	; uninstall and a fresh reinstall.
-	RMDir /r "$INSTDIR"
-
-	RMDir /r "$SMPROGRAMS\Cockatrice"
+	RMDir "$SMPROGRAMS\Cockatrice"

 	DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Cockatrice"
 SectionEnd
--- a/cmake/pch/qtcore_pch.h
+++ b/cmake/pch/qtcore_pch.h
@ -1,24 +0,0 @@
-/** @file qtcore_pch.h
- *  @brief Precompiled header for all Qt targets (Qt Core only).
- *
- * Safe for every target that links Qt Core, including the headless
- * Servatrice binary. Keep this header free of any widget/gui types.
- */
-
-#include <QBasicTimer>
-#include <QByteArray>
-#include <QDateTime>
-#include <QDebug>
-#include <QFile>
-#include <QHash>
-#include <QList>
-#include <QLoggingCategory>
-#include <QMap>
-#include <QMetaObject>
-#include <QObject>
-#include <QRandomGenerator>
-#include <QSharedPointer>
-#include <QString>
-#include <QStringList>
-#include <QTimer>
-#include <QVariant>
--- a/cmake/pch/qtwidgets_pch.h
+++ b/cmake/pch/qtwidgets_pch.h
@ -1,30 +0,0 @@
-/** @file qtwidgets_pch.h
- *  @brief Precompiled header for GUI targets (Cockatrice client, Oracle).
- *
- * Includes the Qt Core precompiled header plus the heavy Gui, Widgets and
- * Network layers that virtually every client translation unit re-parses.
- * Do not use on Servatrice (headless, QT_DONT_USE_QTGUI).
- */
-
-#include "qtcore_pch.h"
-
-#include <QAction>
-#include <QApplication>
-#include <QFrame>
-#include <QGraphicsItem>
-#include <QGraphicsScene>
-#include <QGraphicsView>
-#include <QImage>
-#include <QLabel>
-#include <QLayout>
-#include <QMainWindow>
-#include <QMenu>
-#include <QNetworkAccessManager>
-#include <QNetworkReply>
-#include <QPainter>
-#include <QPushButton>
-#include <QScrollArea>
-#include <QTabWidget>
-#include <QToolBar>
-#include <QTreeWidget>
-#include <QWidget>
--- a/cockatrice/CMakeLists.txt
+++ b/cockatrice/CMakeLists.txt
@ -15,9 +15,6 @@ set(cockatrice_SOURCES
    src/client/network/update/client/client_update_checker.cpp
    src/client/network/update/client/release_channel.cpp
    src/client/network/update/card_spoiler/spoiler_background_updater.cpp
-    src/client/latency_graph_widget.cpp
-    src/client/latency_status_widget.cpp
-    src/client/lag_monitor.cpp
    src/client/sound_engine.cpp
    src/client/settings/cache_settings.cpp
    src/client/settings/card_counter_settings.cpp
@ -39,20 +36,14 @@ set(cockatrice_SOURCES
    src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp
    src/interface/widgets/dialogs/dlg_forgot_password_request.cpp
    src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp
-    src/interface/widgets/dialogs/dlg_invite_to_game.cpp
    src/interface/widgets/dialogs/dlg_load_deck.cpp
    src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp
    src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp
    src/interface/widgets/dialogs/dlg_load_remote_deck.cpp
    src/interface/widgets/dialogs/dlg_local_game_options.cpp
-    src/interface/widgets/dialogs/dlg_login_prompt.cpp
    src/interface/widgets/dialogs/dlg_manage_sets.cpp
-    src/interface/widgets/dialogs/dlg_my_reports.cpp
    src/interface/widgets/dialogs/dlg_register.cpp
-    src/interface/widgets/dialogs/dlg_report_user.cpp
    src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp
-    src/interface/widgets/dialogs/dlg_share_deck.cpp
-    src/interface/widgets/dialogs/dlg_shared_decks_preview.cpp
    src/interface/widgets/dialogs/dlg_settings.cpp
    src/interface/widgets/dialogs/dlg_startup_card_check.cpp
    src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp
@ -60,9 +51,6 @@ set(cockatrice_SOURCES
    src/interface/widgets/dialogs/dlg_view_log.cpp
    src/interface/widgets/dialogs/override_printing_warning.cpp
    src/interface/widgets/dialogs/tip_of_the_day.cpp
-    src/interface/widgets/deck_share/deck_share_utils.cpp
-    src/interface/widgets/deck_share/shared_deck_preview_widget.cpp
-    src/interface/widgets/deck_share/share_bar_widget.cpp
    src/filters/deck_filter_string.cpp
    src/filters/filter_builder.cpp
    src/filters/filter_tree_model.cpp
@ -155,11 +143,7 @@ set(cockatrice_SOURCES
    src/interface/intents/intent_wait_for_database_load.h
    src/interface/layouts/flow_layout.cpp
    src/interface/layouts/overlap_layout.cpp
-    src/interface/widgets/utility/card_completer_delegate.cpp
-    src/interface/widgets/utility/card_completer_styler.cpp
-    src/interface/widgets/utility/completer_utils.cpp
    src/interface/widgets/utility/line_edit_completer.cpp
-    src/interface/widgets/utility/reversed_completer_model.cpp
    src/interface/pixel_map_generator.cpp
    src/interface/theme_config.cpp
    src/interface/theme_manager.cpp
@ -169,11 +153,8 @@ set(cockatrice_SOURCES
    src/interface/palette_editor/palette_grid_widget.cpp
    src/interface/palette_editor/palette_editor_dialog.cpp
    src/interface/widgets/cards/additional_info/color_identity_widget.cpp
-    src/interface/widgets/cards/additional_info/deck_color_identity.cpp
    src/interface/widgets/cards/additional_info/mana_cost_widget.cpp
    src/interface/widgets/cards/additional_info/mana_symbol_widget.cpp
-    src/interface/widgets/cards/art_crop_attribution.cpp
-    src/interface/widgets/cards/card_art_utils.cpp
    src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp
    src/interface/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp
    src/interface/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.cpp
@ -222,7 +203,6 @@ set(cockatrice_SOURCES
    src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp
    src/interface/widgets/deck_editor/deck_list_style_proxy.cpp
    src/interface/widgets/deck_editor/deck_state_manager.cpp
-    src/interface/widgets/deck_editor/deck_zone_dialog.cpp
    src/interface/widgets/deck_editor/printing_disabled_info_widget.cpp
    src/interface/widgets/general/background_sources.cpp
    src/interface/widgets/general/display/background_plate_widget.cpp
@ -239,7 +219,6 @@ set(cockatrice_SOURCES
    src/interface/widgets/general/display/charts/bars/segmented_bar_widget.cpp
    src/interface/widgets/general/display/charts/pies/color_pie.cpp
    src/interface/widgets/general/home_styled_button.cpp
-    src/interface/widgets/general/home_tab_button_color.h
    src/interface/widgets/general/home_widget.cpp
    src/interface/widgets/general/layout_containers/flow_widget.cpp
    src/interface/widgets/general/layout_containers/overlap_control_widget.cpp
@ -255,10 +234,6 @@ set(cockatrice_SOURCES
    src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp
    src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp
    src/interface/widgets/printing_selector/set_name_and_collectors_number_display_widget.cpp
-    src/interface/widgets/playmat/playmat_collection_dialog.cpp
-    src/interface/widgets/playmat/playmat_collection_dialog.h
-    src/interface/widgets/playmat/playmat_preview_widget.cpp
-    src/interface/widgets/playmat/playmat_settings_dialog.cpp
    src/interface/widgets/quick_settings/settings_button_widget.cpp
    src/interface/widgets/quick_settings/settings_popup_widget.cpp
    src/interface/widgets/replay/replay_manager.cpp
@ -267,7 +242,6 @@ set(cockatrice_SOURCES
    src/interface/widgets/replay/replay_widget.cpp
    src/interface/widgets/server/chat_view/chat_view.cpp
    src/interface/widgets/server/game_filter_configs.cpp
-    src/interface/widgets/server/game_link.cpp
    src/interface/widgets/server/game_selector.cpp
    src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp
    src/interface/widgets/server/games_model.cpp
@ -280,10 +254,8 @@ set(cockatrice_SOURCES
    src/interface/widgets/server/user/user_context_menu.cpp
    src/interface/widgets/server/user/user_info_box.cpp
    src/interface/widgets/server/user/user_info_connection.cpp
-    src/interface/widgets/server/user/user_list_dialog.cpp
    src/interface/widgets/server/user/user_list_manager.cpp
    src/interface/widgets/server/user/user_list_painter.cpp
-    src/interface/widgets/server/user/user_list_panel_widget.cpp
    src/interface/widgets/server/user/user_list_widget.cpp
    src/interface/widgets/settings_page/abstract_settings_page.cpp
    src/interface/widgets/settings_page/appearance_settings_page.cpp
@ -298,8 +270,6 @@ set(cockatrice_SOURCES
    src/interface/widgets/settings_page/user_interface_settings_page.cpp
    src/interface/widgets/utility/custom_line_edit.cpp
    src/interface/widgets/utility/get_text_with_max.cpp
-    src/interface/widgets/utility/report_utils.cpp
-    src/interface/widgets/utility/report_utils.h
    src/interface/widgets/utility/sequence_edit.cpp
    src/interface/widgets/utility/visibility_change_listener.cpp
    src/interface/widgets/utility/visibility_change_listener.h
@ -324,13 +294,9 @@ set(cockatrice_SOURCES
    src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_display_widget.cpp
    src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_item_widget.cpp
    src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp
-    src/interface/widgets/visual_deck_storage/deck_preview/public_deck_preview_widget.cpp
-    src/interface/widgets/visual_deck_storage/remote_public_decks_model.cpp
    src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp
-    src/interface/widgets/visual_deck_storage/visual_deck_storage_model.cpp
    src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp
    src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp
-    src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_filter_proxy_model.cpp
    src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp
    src/interface/widgets/visual_deck_storage/visual_deck_storage_tag_filter_widget.cpp
    src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp
@ -391,14 +357,10 @@ set(cockatrice_SOURCES
    src/interface/widgets/tabs/tab_card_art_rules.cpp
    src/interface/widgets/tabs/tab_deck_editor.cpp
    src/interface/widgets/tabs/tab_deck_storage.cpp
-    src/interface/widgets/tabs/tab_developer.cpp
    src/interface/widgets/tabs/tab_game.cpp
    src/interface/widgets/tabs/tab_home.cpp
    src/interface/widgets/tabs/tab_logs.cpp
    src/interface/widgets/tabs/tab_message.cpp
-    src/interface/widgets/tabs/tab_moderation.cpp
-    src/interface/widgets/tabs/tab_public_decks.cpp
-    src/interface/widgets/tabs/tab_report.cpp
    src/interface/widgets/tabs/tab_replays.cpp
    src/interface/widgets/tabs/tab_room.cpp
    src/interface/widgets/tabs/tab_server.cpp
@ -412,28 +374,6 @@ set(cockatrice_SOURCES
    src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_service.cpp
    src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_widget.cpp
    src/interface/widgets/tabs/api/commander_spellbook/handle_commander_brackets.cpp
-    src/interface/widgets/onboarding/banner_shader_config.h
-    src/interface/widgets/onboarding/brand_colors.h
-    src/interface/widgets/onboarding/first_run_wizard.cpp
-    src/interface/widgets/onboarding/first_run_wizard.h
-    src/interface/widgets/onboarding/first_run_wizard_page.cpp
-    src/interface/widgets/onboarding/first_run_wizard_page.h
-    src/interface/widgets/onboarding/pages/account_setup_page.cpp
-    src/interface/widgets/onboarding/pages/account_setup_page.h
-    src/interface/widgets/onboarding/pages/card_database_setup_page.cpp
-    src/interface/widgets/onboarding/pages/card_database_setup_page.h
-    src/interface/widgets/onboarding/pages/finish_page.cpp
-    src/interface/widgets/onboarding/pages/finish_page.h
-    src/interface/widgets/onboarding/pages/preferences_setup_page.cpp
-    src/interface/widgets/onboarding/pages/preferences_setup_page.h
-    src/interface/widgets/onboarding/pages/theme_setup_page.cpp
-    src/interface/widgets/onboarding/pages/theme_setup_page.h
-    src/interface/widgets/onboarding/pages/welcome_page.cpp
-    src/interface/widgets/onboarding/pages/welcome_page.h
-    src/interface/widgets/onboarding/shader_banner_widget.cpp
-    src/interface/widgets/onboarding/shader_banner_widget.h
-    src/interface/widgets/onboarding/step_indicator_widget.cpp
-    src/interface/widgets/onboarding/step_indicator_widget.h
    src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.cpp
    src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.h
    src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.cpp
@ -452,10 +392,6 @@ set(cockatrice_SOURCES
    src/interface/intents/intent_join_server_room.h
    src/interface/intents/intent_login.cpp
    src/interface/intents/intent_login.h
-    src/interface/intents/intent_open_server_room_by_name.cpp
-    src/interface/intents/intent_open_server_room_by_name.h
-    src/interface/intents/intent_open_shared_deck.cpp
-    src/interface/intents/intent_open_shared_deck.h
    src/interface/intents/url_parser.cpp
    src/interface/intents/url_parser.h
    src/interface/widgets/server/user/user_info_popup.cpp
@ -532,31 +468,6 @@ qt6_add_executable(
  MANUAL_FINALIZATION
 )

-target_precompile_headers(cockatrice PRIVATE "${CMAKE_SOURCE_DIR}/cmake/pch/qtwidgets_pch.h")
-
-qt6_add_shaders(
-  cockatrice
-  "onboarding_shaders"
-  PREFIX
-  "/onboarding/shaders"
-  BASE
-  "src/interface/widgets/onboarding/shaders"
-  FILES
-  src/interface/widgets/onboarding/shaders/brand_banner.frag
-  src/interface/widgets/onboarding/shaders/brand_plate.frag
-)
-
-qt6_add_resources(
-  cockatrice
-  "onboarding_qml"
-  PREFIX
-  "/onboarding/qml"
-  BASE
-  "src/interface/widgets/onboarding/qml"
-  FILES
-  src/interface/widgets/onboarding/qml/BrandBanner.qml
-)
-
 target_link_libraries(
  cockatrice
  PUBLIC libcockatrice_card
@ -668,35 +579,18 @@ if(WIN32)
  set(qtconf_dest_dir .)

  install(
-    DIRECTORY "$<TARGET_FILE_DIR:cockatrice>/"
+    DIRECTORY "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/${CMAKE_BUILD_TYPE}/"
    DESTINATION ./
    FILES_MATCHING
    PATTERN "*.dll"
-    PATTERN "*.pdb" EXCLUDE
-    PATTERN "*.dir*" EXCLUDE
-    PATTERN "*_autogen*" EXCLUDE
-    PATTERN "*.tlog*" EXCLUDE
-    PATTERN "CMakeFiles*" EXCLUDE
-    PATTERN "x64*" EXCLUDE
-    PATTERN ".qt*" EXCLUDE
-    PATTERN ".qsb*" EXCLUDE
-    PATTERN ".lupdate*" EXCLUDE
  )

  install(
    DIRECTORY "${CMAKE_BINARY_DIR}/cockatrice/"
    DESTINATION ./
    FILES_MATCHING
+    PATTERN "CMakeFiles" EXCLUDE
    PATTERN "*.ini"
-    PATTERN "CMakeFiles*" EXCLUDE
-    PATTERN "*.dir*" EXCLUDE
-    PATTERN "*_autogen*" EXCLUDE
-    PATTERN "*.tlog*" EXCLUDE
-    PATTERN "*.pdb" EXCLUDE
-    PATTERN "x64*" EXCLUDE
-    PATTERN ".qt*" EXCLUDE
-    PATTERN ".qsb*" EXCLUDE
-    PATTERN ".lupdate*" EXCLUDE
  )

  # Qt plugins: audio, iconengines, imageformats, multimedia, platforms, printsupport, styles, tls
@ -749,6 +643,10 @@ Data = Resources\")
        "
    COMPONENT Runtime
  )
+
+  if(OPENSSL_FOUND)
+    install(FILES ${OPENSSL_INCLUDE_DIRS} DESTINATION ./)
+  endif()
 endif()

 if(Qt6LinguistTools_FOUND)
--- a/cockatrice/cockatrice.qrc
+++ b/cockatrice/cockatrice.qrc
@ -2,7 +2,6 @@
    <qresource prefix="/">
        <file>resources/cardback.svg</file>
        <file>resources/cockatrice.svg</file>
-        <file>resources/cockatrice-logo-white.svg</file>
        <file>resources/hand.svg</file>
        <file>resources/hr.jpg</file>

@ -63,8 +62,6 @@
        <file>resources/icons/mana/W.svg</file>

        <file>resources/backgrounds/home.png</file>
-        <file>resources/backgrounds/home-dark.png</file>
-        <file>resources/backgrounds/home-light.png</file>
        <file>resources/backgrounds/card_triplet.svg</file>
        <file>resources/backgrounds/placeholder_printing_selector.svg</file>

@ -365,8 +362,6 @@

        <file>resources/usericons/pawn_single.svg</file>
        <file>resources/usericons/pawn_double.svg</file>
-        <file>resources/usericons/pawn_dev_single.svg</file>
-        <file>resources/usericons/pawn_dev_double.svg</file>
        <file>resources/usericons/pawn_donator_single.svg</file>
        <file>resources/usericons/pawn_donator_double.svg</file>
        <file>resources/usericons/pawn_judge_single.svg</file>
--- a/cockatrice/resources/backgrounds/home-dark.png
+++ b/cockatrice/resources/backgrounds/home-dark.png
--- a/cockatrice/resources/backgrounds/home-light.png
+++ b/cockatrice/resources/backgrounds/home-light.png
--- a/cockatrice/resources/backgrounds/home.png
+++ b/cockatrice/resources/backgrounds/home.png
--- a/cockatrice/resources/cockatrice-logo-white.svg
+++ b/cockatrice/resources/cockatrice-logo-white.svg
--- a/cockatrice/resources/cockatrice.svg
+++ b/cockatrice/resources/cockatrice.svg
--- a/cockatrice/resources/countries/cn.svg
+++ b/cockatrice/resources/countries/cn.svg
@ -52,7 +52,8 @@
     id="defs8">
    <polygon
       id="s"
-       points="-0.587785,0.809017 0,-1 0.587785,0.809017 -0.951057,-0.309017 0.951057,-0.309017 "
+       points="-301930,415571 0,-513674 301930,415571 -488533,-158734 488533,-158734 "
+       transform="scale(1.94676e-6,1.94676e-6)"
       style="fill:#ffde00" />
    <clipPath
       clipPathUnits="userSpaceOnUse"
--- a/cockatrice/resources/countries/ss.svg
+++ b/cockatrice/resources/countries/ss.svg
@ -16,6 +16,6 @@
  <rect id="rect10" height="2.88" width="12.8" y="4.278e-9" x="0"/>
  <rect id="rect12" height="2.88" width="12.8" y="3.36" x="0" fill="#da121a"/>
  <polygon id="polygon14" points="0 0 8.6603 5 0 10" fill="#0f47af" transform="scale(.96)"/>
-  <polygon id="polygon16" points="4.01394 3.897169 1.23532 4.8 4.01394 5.702831 2.296666 3.3392 2.296666 6.2608" fill="#fcdd09"/>
+  <polygon id="polygon16" points="4.1557e5 -3.0193e5 -5.1367e5 0 4.1557e5 3.0193e5 -1.5873e5 -4.8853e5 -1.5873e5 4.8853e5" fill="#fcdd09" transform="matrix(.0000029902 0 0 .0000029902 2.7713 4.8)"/>
 </g>
 </svg>
--- a/cockatrice/resources/help/search.md
+++ b/cockatrice/resources/help/search.md
@ -52,7 +52,6 @@ In this list of examples below, each entry has an explanation and can be clicked
 <dt><u>E</u>dition:</dt>
 <dd>[set:lea](#set:lea) <small>(Cards that appear in Alpha, which has the set code LEA)</small></dd>
 <dd>[e:lea OR e:leb](#e:lea OR e:leb) <small>(Cards that appear in Alpha or Beta)</small></dd>
-<dd>[e&lt;8ED](#e<8ED) <small>(Cards that appear before 8th edition)</small></dd>

 <dt>Negate:</dt>
 <dd>[c:wu -c:m](#c:wu -c:m) <small>(Any card that is white or blue, but not multicolored)</small></dd>
--- a/cockatrice/resources/usericons/pawn_dev_double.svg
+++ b/cockatrice/resources/usericons/pawn_dev_double.svg
@ -1,343 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-  width="100"
-  height="100"
-  id="svg5322"
-  version="1.1"
-  inkscape:version="1.4.2 (ebf0e940, 2025-05-08)"
-  sodipodi:docname="pawn_dev_double.svg"
-  xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-  xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-  xmlns:xlink="http://www.w3.org/1999/xlink"
-  xmlns="http://www.w3.org/2000/svg"
-  xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-  xmlns:cc="http://creativecommons.org/ns#"
-  xmlns:dc="http://purl.org/dc/elements/1.1/">
-  <defs
-    id="defs3">
-    <inkscape:perspective
-      sodipodi:type="inkscape:persp3d"
-      inkscape:vp_x="0 : 526.18109 : 1"
-      inkscape:vp_y="0 : 1000 : 0"
-      inkscape:vp_z="744.09448 : 526.18109 : 1"
-      inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-      id="perspective5328"/>
-    <inkscape:perspective
-      id="perspective5305"
-      inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-      inkscape:vp_z="1 : 0.5 : 1"
-      inkscape:vp_y="0 : 1000 : 0"
-      inkscape:vp_x="0 : 0.5 : 1"
-      sodipodi:type="inkscape:persp3d"/>
-    <linearGradient
-      id="linearGradient5181">
-      <stop
-        style="stop-color:#0fbb00;stop-opacity:1;"
-        offset="0"
-        id="stop5183"/>
-      <stop
-        style="stop-color:#064400;stop-opacity:1;"
-        offset="1"
-        id="stop5185"/>
-    </linearGradient>
-    <radialGradient
-      inkscape:collect="always"
-      xlink:href="#linearGradient3600-2"
-      id="radialGradient3606-7"
-      cx="324.32715"
-      cy="131.40274"
-      fx="324.32715"
-      fy="131.40274"
-      r="25.501276"
-      gradientUnits="userSpaceOnUse"
-      gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)"/>
-    <linearGradient
-      id="linearGradient3600-2">
-      <stop
-        style="stop-color:#ffc33d;stop-opacity:1;"
-        offset="0"
-        id="stop3602-4"/>
-      <stop
-        style="stop-color:#e09900;stop-opacity:1;"
-        offset="1"
-        id="stop3604-9"/>
-    </linearGradient>
-    <inkscape:perspective
-      id="perspective5478"
-      inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-      inkscape:vp_z="1 : 0.5 : 1"
-      inkscape:vp_y="0 : 1000 : 0"
-      inkscape:vp_x="0 : 0.5 : 1"
-      sodipodi:type="inkscape:persp3d"/>
-    <linearGradient
-      id="linearGradient5189">
-      <stop
-        style="stop-color:#000ec9;stop-opacity:1;"
-        offset="0"
-        id="stop5191"/>
-      <stop
-        style="stop-color:#000657;stop-opacity:1;"
-        offset="1"
-        id="stop5193"/>
-    </linearGradient>
-    <radialGradient
-      inkscape:collect="always"
-      xlink:href="#linearGradient3600-4"
-      id="radialGradient3606-1"
-      cx="324.32715"
-      cy="131.40274"
-      fx="324.32715"
-      fy="131.40274"
-      r="25.501276"
-      gradientUnits="userSpaceOnUse"
-      gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)"/>
-    <linearGradient
-      id="linearGradient3600-4">
-      <stop
-        style="stop-color:#ffc33d;stop-opacity:1;"
-        offset="0"
-        id="stop3602-3"/>
-      <stop
-        style="stop-color:#e09900;stop-opacity:1;"
-        offset="1"
-        id="stop3604-5"/>
-    </linearGradient>
-    <inkscape:perspective
-      id="perspective5559"
-      inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-      inkscape:vp_z="1 : 0.5 : 1"
-      inkscape:vp_y="0 : 1000 : 0"
-      inkscape:vp_x="0 : 0.5 : 1"
-      sodipodi:type="inkscape:persp3d"/>
-    <linearGradient
-      inkscape:collect="always"
-      xlink:href="#linearGradient5173"
-      id="linearGradient5179"
-      x1="167.33386"
-      y1="178.83276"
-      x2="244.78181"
-      y2="178.83276"
-      gradientUnits="userSpaceOnUse"/>
-    <linearGradient
-      id="linearGradient5173">
-      <stop
-        style="stop-color:#f50000;stop-opacity:1;"
-        offset="0"
-        id="stop5175"/>
-      <stop
-        style="stop-color:#950000;stop-opacity:1;"
-        offset="1"
-        id="stop5177"/>
-    </linearGradient>
-    <radialGradient
-      inkscape:collect="always"
-      xlink:href="#linearGradient3600"
-      id="radialGradient5169"
-      gradientUnits="userSpaceOnUse"
-      gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)"
-      cx="324.32715"
-      cy="131.40274"
-      fx="324.32715"
-      fy="131.40274"
-      r="25.501276"/>
-    <linearGradient
-      id="linearGradient3600">
-      <stop
-        style="stop-color:#ffc13d;stop-opacity:1;"
-        offset="0"
-        id="stop3602"/>
-      <stop
-        style="stop-color:#e09900;stop-opacity:1;"
-        offset="1"
-        id="stop3604"/>
-    </linearGradient>
-    <radialGradient
-      r="25.501276"
-      fy="131.40274"
-      fx="324.32715"
-      cy="131.40274"
-      cx="324.32715"
-      gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)"
-      gradientUnits="userSpaceOnUse"
-      id="radialGradient5574"
-      xlink:href="#linearGradient3600"
-      inkscape:collect="always"/>
-    <inkscape:perspective
-      id="perspective5663"
-      inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-      inkscape:vp_z="1 : 0.5 : 1"
-      inkscape:vp_y="0 : 1000 : 0"
-      inkscape:vp_x="0 : 0.5 : 1"
-      sodipodi:type="inkscape:persp3d"/>
-    <radialGradient
-      inkscape:collect="always"
-      xlink:href="#linearGradient3600-7"
-      id="radialGradient3606-8"
-      cx="324.32715"
-      cy="131.40274"
-      fx="324.32715"
-      fy="131.40274"
-      r="25.501276"
-      gradientUnits="userSpaceOnUse"
-      gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)"/>
-    <linearGradient
-      id="linearGradient3600-7">
-      <stop
-        style="stop-color:#ffc13d;stop-opacity:1;"
-        offset="0"
-        id="stop3602-7"/>
-      <stop
-        style="stop-color:#e09900;stop-opacity:1;"
-        offset="1"
-        id="stop3604-6"/>
-    </linearGradient>
-    <radialGradient
-      inkscape:collect="always"
-      xlink:href="#linearGradient3600-7"
-      id="radialGradient5254"
-      gradientUnits="userSpaceOnUse"
-      gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)"
-      cx="324.32715"
-      cy="131.40274"
-      fx="324.32715"
-      fy="131.40274"
-      r="25.501276"/>
-    <linearGradient
-      inkscape:collect="always"
-      xlink:href="#linearGradient5189-1"
-      id="linearGradient5394"
-      gradientUnits="userSpaceOnUse"
-      x1="385.03503"
-      y1="180.09546"
-      x2="462.48297"
-      y2="180.09546"
-      gradientTransform="matrix(0.96839241,0,0,0.96839241,-360.365,847.52359)"/>
-    <linearGradient
-      id="linearGradient5189-1">
-      <stop
-        style="stop-color:#000ec9;stop-opacity:1;"
-        offset="0"
-        id="stop5191-0"/>
-      <stop
-        style="stop-color:#000657;stop-opacity:1;"
-        offset="1"
-        id="stop5193-4"/>
-    </linearGradient>
-    <linearGradient
-      inkscape:collect="always"
-      xlink:href="#linearGradient5173-1"
-      id="linearGradient5581"
-      gradientUnits="userSpaceOnUse"
-      x1="167.33386"
-      y1="178.83276"
-      x2="244.78181"
-      y2="178.83276"
-      gradientTransform="matrix(0.96839241,0,0,0.96839241,-149.54484,848.74636)"/>
-    <linearGradient
-      id="linearGradient5173-1">
-      <stop
-        style="stop-color:#f50000;stop-opacity:1;"
-        offset="0"
-        id="stop5175-5"/>
-      <stop
-        style="stop-color:#950000;stop-opacity:1;"
-        offset="1"
-        id="stop5177-3"/>
-    </linearGradient>
-    <linearGradient
-      inkscape:collect="always"
-      xlink:href="#linearGradient5181-9"
-      id="linearGradient5782"
-      gradientUnits="userSpaceOnUse"
-      x1="282.50455"
-      y1="181.61069"
-      x2="359.95248"
-      y2="181.61069"
-      gradientTransform="matrix(0.96839241,0,0,0.96839241,-261.07526,846.05625)"/>
-    <linearGradient
-      id="linearGradient5181-9">
-      <stop
-        style="stop-color:#80d600;stop-opacity:1;"
-        offset="0"
-        id="stop5183-3"/>
-      <stop
-        style="stop-color:#80d600;stop-opacity:1;"
-        offset="1"
-        id="stop5185-0"/>
-    </linearGradient>
-    <linearGradient
-      y2="181.61069"
-      x2="359.95248"
-      y1="181.61069"
-      x1="282.50455"
-      gradientTransform="matrix(0.96839241,0,0,0.96839241,-175.71812,893.2775)"
-      gradientUnits="userSpaceOnUse"
-      id="linearGradient5799"
-      xlink:href="#linearGradient5181-9"
-      inkscape:collect="always"/>
-  </defs>
-  <sodipodi:namedview
-    inkscape:document-units="mm"
-    id="base"
-    pagecolor="#ffffff"
-    bordercolor="#666666"
-    borderopacity="1.0"
-    inkscape:pageopacity="0.0"
-    inkscape:pageshadow="2"
-    inkscape:zoom="6.0735294"
-    inkscape:cx="53.757869"
-    inkscape:cy="53.840194"
-    inkscape:current-layer="layer1"
-    showgrid="false"
-    inkscape:window-width="1696"
-    inkscape:window-height="1051"
-    inkscape:window-x="98"
-    inkscape:window-y="1118"
-    inkscape:window-maximized="1"
-    inkscape:showpageshadow="2"
-    inkscape:pagecheckerboard="0"
-    inkscape:deskcolor="#d1d1d1"
-    showguides="true">
-    <sodipodi:guide
-      position="49.829627,61.114263"
-      orientation="1,0"
-      id="guide1"
-      inkscape:locked="false"/>
-  </sodipodi:namedview>
-  <metadata
-    id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-        rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-          rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-        <dc:title/>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-    inkscape:label="Layer 1"
-    inkscape:groupmode="layer"
-    id="layer1"
-    transform="translate(0,-952.36218)">
-    <path
-      style="fill-opacity:1;stroke:black;stroke-width:2.78220296;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-      d="M 49.84375 1.71875 C 36.719738 1.71875 26.0625 12.375988 26.0625 25.5 C 26.0625 32.977454 29.538325 39.612734 34.9375 43.96875 C 24.439951 49.943698 17.919149 62.196126 14.3125 75.65625 C 9.0380874 95.34065 30.224013 98.21875 49.84375 98.21875 C 69.463486 98.21875 90.549327 94.96715 85.375 75.65625 C 81.693381 61.916246 75.224585 49.827177 64.8125 43.9375 C 70.181573 39.580662 73.59375 32.953205 73.59375 25.5 C 73.59375 12.375988 62.967762 1.71875 49.84375 1.71875 z "
-      transform="translate(0,952.36218)"
-      id="left"/>
-    <path
-      style="opacity:1;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.73577702;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-      d="m 51.28696,1001.834 0,-46.98372 1.434151,0.16768 c 5.155008,0.60274 9.462857,2.72154 12.938257,6.36366 4.74393,4.9715 6.87913,11.35611 6.16464,18.43328 -0.53702,5.31935 -3.09008,10.59498 -6.83833,14.13074 l -1.94072,1.83069 3.04083,2.20427 c 3.58084,2.5957 7.18975,6.4912 9.55296,10.3116 4.89572,7.9144 9.23593,21.4918 8.50487,26.6055 -0.81312,5.6877 -5.43872,9.6977 -13.62216,11.8093 -3.80822,0.9826 -7.68056,1.4713 -14.763321,1.8633 l -4.471177,0.2474 0,-46.9837 z"
-      id="right"
-      inkscape:connector-curvature="0"/>
-    <path
-      d="m 478.409,116.617 c -0.368,-4.271 -3.181,-7.94 -7.2,-9.403 -4.029,-1.472 -8.539,-0.47 -11.57,2.556 l -62.015,62.011 -68.749,-21.768 -21.768,-68.748 62.016,-62.016 c 3.035,-3.032 4.025,-7.543 2.563,-11.565 -1.477,-4.03 -5.137,-6.837 -9.417,-7.207 -37.663,-3.245 -74.566,10.202 -101.247,36.887 -36.542,36.545 -46.219,89.911 -29.083,135.399 -1.873,1.578 -3.721,3.25 -5.544,5.053 L 19.386,373.152 c -0.073,0.071 -0.145,0.149 -0.224,0.219 -24.345,24.346 -24.345,63.959 0,88.309 24.349,24.344 63.672,24.048 88.013,-0.298 0.105,-0.098 0.201,-0.196 0.297,-0.305 L 301.104,252.456 c 1.765,-1.773 3.404,-3.628 4.949,-5.532 45.5,17.167 98.9,7.513 135.474,-29.056 26.675,-26.687 40.131,-63.593 36.882,-101.251 z M 75.98,435.38 c -8.971,8.969 -23.5,8.963 -32.47,0 -8.967,-8.961 -8.967,-23.502 0,-32.466 8.97,-8.963 23.499,-8.963 32.47,0 8.967,8.964 8.967,23.505 0,32.466 z"
-      id="path1"
-      style="display:inline;fill:#A1A1A1;stroke-width:9.87059588;stroke-dasharray:none;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-      transform="matrix(0.19145387,0,0,0.19145387,4.0816072,956.99677)"
-      inkscape:label="wrench" />
-  </g>
-</svg>
--- a/cockatrice/resources/usericons/pawn_dev_single.svg
+++ b/cockatrice/resources/usericons/pawn_dev_single.svg
@ -1,211 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-  width="100"
-  height="100"
-  id="svg5322"
-  version="1.1"
-  inkscape:version="1.4.2 (ebf0e940, 2025-05-08)"
-  sodipodi:docname="pawn_dev_single.svg"
-  xml:space="preserve"
-  xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-  xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-  xmlns:xlink="http://www.w3.org/1999/xlink"
-  xmlns="http://www.w3.org/2000/svg"
-  xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-  xmlns:cc="http://creativecommons.org/ns#"
-  xmlns:dc="http://purl.org/dc/elements/1.1/"><defs
-     id="defs3"><inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective5328" /><inkscape:perspective
-       id="perspective5305"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" /><linearGradient
-       id="linearGradient5181"><stop
-         style="stop-color:#0fbb00;stop-opacity:1;"
-         offset="0"
-         id="stop5183" /><stop
-         style="stop-color:#064400;stop-opacity:1;"
-         offset="1"
-         id="stop5185" /></linearGradient><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3600-2"
-       id="radialGradient3606-7"
-       cx="324.32715"
-       cy="131.40274"
-       fx="324.32715"
-       fy="131.40274"
-       r="25.501276"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)" /><linearGradient
-       id="linearGradient3600-2"><stop
-         style="stop-color:#ffc33d;stop-opacity:1;"
-         offset="0"
-         id="stop3602-4" /><stop
-         style="stop-color:#e09900;stop-opacity:1;"
-         offset="1"
-         id="stop3604-9" /></linearGradient><inkscape:perspective
-       id="perspective5478"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" /><linearGradient
-       id="linearGradient5189"><stop
-         style="stop-color:#000ec9;stop-opacity:1;"
-         offset="0"
-         id="stop5191" /><stop
-         style="stop-color:#000657;stop-opacity:1;"
-         offset="1"
-         id="stop5193" /></linearGradient><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3600-4"
-       id="radialGradient3606-1"
-       cx="324.32715"
-       cy="131.40274"
-       fx="324.32715"
-       fy="131.40274"
-       r="25.501276"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)" /><linearGradient
-       id="linearGradient3600-4"><stop
-         style="stop-color:#ffc33d;stop-opacity:1;"
-         offset="0"
-         id="stop3602-3" /><stop
-         style="stop-color:#e09900;stop-opacity:1;"
-         offset="1"
-         id="stop3604-5" /></linearGradient><inkscape:perspective
-       id="perspective5559"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" /><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5173"
-       id="linearGradient5179"
-       x1="167.33386"
-       y1="178.83276"
-       x2="244.78181"
-       y2="178.83276"
-       gradientUnits="userSpaceOnUse" /><linearGradient
-       id="linearGradient5173"><stop
-         style="stop-color:#f50000;stop-opacity:1;"
-         offset="0"
-         id="stop5175" /><stop
-         style="stop-color:#950000;stop-opacity:1;"
-         offset="1"
-         id="stop5177" /></linearGradient><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3600"
-       id="radialGradient5169"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)"
-       cx="324.32715"
-       cy="131.40274"
-       fx="324.32715"
-       fy="131.40274"
-       r="25.501276" /><linearGradient
-       id="linearGradient3600"><stop
-         style="stop-color:#ffc13d;stop-opacity:1;"
-         offset="0"
-         id="stop3602" /><stop
-         style="stop-color:#e09900;stop-opacity:1;"
-         offset="1"
-         id="stop3604" /></linearGradient><radialGradient
-       r="25.501276"
-       fy="131.40274"
-       fx="324.32715"
-       cy="131.40274"
-       cx="324.32715"
-       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient5574"
-       xlink:href="#linearGradient3600"
-       inkscape:collect="always" /><inkscape:perspective
-       id="perspective5663"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" /><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3600-7"
-       id="radialGradient3606-8"
-       cx="324.32715"
-       cy="131.40274"
-       fx="324.32715"
-       fy="131.40274"
-       r="25.501276"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)" /><linearGradient
-       id="linearGradient3600-7"><stop
-         style="stop-color:#ffc13d;stop-opacity:1;"
-         offset="0"
-         id="stop3602-7" /><stop
-         style="stop-color:#e09900;stop-opacity:1;"
-         offset="1"
-         id="stop3604-6" /></linearGradient><radialGradient
-       r="25.501276"
-       fy="131.40274"
-       fx="324.32715"
-       cy="131.40274"
-       cx="324.32715"
-       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient5676"
-       xlink:href="#linearGradient3600-7"
-       inkscape:collect="always" /></defs><sodipodi:namedview
-     inkscape:document-units="mm"
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="3.1582091"
-     inkscape:cx="104.64791"
-     inkscape:cy="56.04442"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1920"
-     inkscape:window-height="1027"
-     inkscape:window-x="0"
-     inkscape:window-y="25"
-     inkscape:window-maximized="1"
-     inkscape:showpageshadow="2"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     showguides="true"><sodipodi:guide
-       position="50.002551,111.99556"
-       orientation="1,0"
-       id="guide3"
-       inkscape:locked="false" /></sodipodi:namedview><metadata
-     id="metadata4"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-952.36218)"
-     style="display:inline">
-    <path
-   style="display:inline;opacity:1;fill-opacity:1;stroke:#000000;stroke-width:2.7822;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-   d="M 49.84375,1.71875 C 36.719738,1.71875 26.0625,12.375988 26.0625,25.5 c 0,7.477454 3.475825,14.112734 8.875,18.46875 -10.497549,5.974948 -17.018351,18.227376 -20.625,31.6875 -5.2744126,19.6844 15.911513,22.5625 35.53125,22.5625 19.619736,0 40.705577,-3.2516 35.53125,-22.5625 C 81.693381,61.916246 75.224585,49.827177 64.8125,43.9375 70.181573,39.580662 73.59375,32.953205 73.59375,25.5 c 0,-13.124012 -10.625988,-23.78125 -23.75,-23.78125 z"
-   id="left"
-   sodipodi:insensitive="true"
-   transform="translate(0,952.36218)" />
-    <path
-   d="m 478.409,116.617 c -0.368,-4.271 -3.181,-7.94 -7.2,-9.403 -4.029,-1.472 -8.539,-0.47 -11.57,2.556 l -62.015,62.011 -68.749,-21.768 -21.768,-68.748 62.016,-62.016 c 3.035,-3.032 4.025,-7.543 2.563,-11.565 -1.477,-4.03 -5.137,-6.837 -9.417,-7.207 -37.663,-3.245 -74.566,10.202 -101.247,36.887 -36.542,36.545 -46.219,89.911 -29.083,135.399 -1.873,1.578 -3.721,3.25 -5.544,5.053 L 19.386,373.152 c -0.073,0.071 -0.145,0.149 -0.224,0.219 -24.345,24.346 -24.345,63.959 0,88.309 24.349,24.344 63.672,24.048 88.013,-0.298 0.105,-0.098 0.201,-0.196 0.297,-0.305 L 301.104,252.456 c 1.765,-1.773 3.404,-3.628 4.949,-5.532 45.5,17.167 98.9,7.513 135.474,-29.056 26.675,-26.687 40.131,-63.593 36.882,-101.251 z M 75.98,435.38 c -8.971,8.969 -23.5,8.963 -32.47,0 -8.967,-8.961 -8.967,-23.502 0,-32.466 8.97,-8.963 23.499,-8.963 32.47,0 8.967,8.964 8.967,23.505 0,32.466 z"
-   id="path1"
-   style="display:inline;fill:#A1A1A1;stroke-width:9.87059588;stroke-dasharray:none;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-   transform="matrix(0.19145387,0,0,0.19145387,4.0816072,956.99677)"
-   inkscape:label="wrench" /></g></svg>
--- a/cockatrice/src/client/lag_monitor.cpp
+++ b/cockatrice/src/client/lag_monitor.cpp
@ -1,63 +0,0 @@
-#include "lag_monitor.h"
-
-#include <QCoreApplication>
-#include <QEvent>
-#include <QTimer>
-
-LagMonitor::LagMonitor(QObject *parent) : QObject(parent)
-{
-    qApp->installEventFilter(this);
-
-    timer = new QTimer(this);
-    timer->setInterval(TICK_INTERVAL_MS);
-    connect(timer, &QTimer::timeout, this, &LagMonitor::checkTick);
-    tickClock.start();
-    timer->start();
-}
-
-QList<LagMonitor::StallRecord> LagMonitor::recentStalls() const
-{
-    return stalls;
-}
-
-void LagMonitor::clearStalls()
-{
-    stalls.clear();
-}
-
-bool LagMonitor::eventFilter(QObject *obj, QEvent *event)
-{
-    if (event->type() == QEvent::ApplicationStateChange) {
-        // The transition may span a suspend or an arbitrary unfocused period;
-        // discard the gap so it cannot be mistaken for a stall.
-        tickClock.restart();
-    }
-    return QObject::eventFilter(obj, event);
-}
-
-void LagMonitor::checkTick()
-{
-    recordGap(tickClock.restart());
-}
-
-void LagMonitor::recordGap(qint64 gapMs)
-{
-    if (gapMs <= STALL_THRESHOLD_MS) {
-        return;
-    }
-
-    if (gapMs > MAX_PLAUSIBLE_STALL_MS) {
-        qCDebug(LagMonitorLog, "Ignoring implausible %lld ms gap (likely suspend)", static_cast<long long>(gapMs));
-        return;
-    }
-
-    const StallRecord record{.timestampMsSinceEpoch = QDateTime::currentMSecsSinceEpoch(), .durationMs = gapMs};
-
-    stalls.append(record);
-    while (stalls.size() > MAX_RECORDED_STALLS) {
-        stalls.removeFirst();
-    }
-
-    qCWarning(LagMonitorLog, "Event loop stalled for %lld ms (threshold: %d ms)", static_cast<long long>(gapMs),
-              STALL_THRESHOLD_MS);
-}
--- a/cockatrice/src/client/lag_monitor.h
+++ b/cockatrice/src/client/lag_monitor.h
@ -1,87 +0,0 @@
-/**
- * @file lag_monitor.h
- * @ingroup Client
- */
-
-#ifndef LAG_MONITOR_H
-#define LAG_MONITOR_H
-
-#include <QDateTime>
-#include <QElapsedTimer>
-#include <QList>
-#include <QLoggingCategory>
-#include <QObject>
-
-inline Q_LOGGING_CATEGORY(LagMonitorLog, "lag_monitor");
-
-class QEvent;
-class QTimer;
-
-/**
- * @brief Detects main-thread event loop stalls ("UI freezes") from the inside.
- *
- * A timer is expected to fire every TICK_INTERVAL_MS of wall time. When the
- * observed gap greatly exceeds that interval, some other task blocked the
- * event loop for roughly the overshooting duration. This is what separates
- * "my client froze" from "the network is lagging" in user reports.
- *
- * Gaps that span an application state change (suspend, minimize, focus
- * loss) are discarded, and implausibly huge gaps are dropped, so operating
- * system power events do not fabricate stalls. This handling is load-bearing
- * on Windows, where the monotonic clock used by Qt counts sleep time.
- *
- * Healthy operation costs one timer wakeup per tick and two integer
- * comparisons. Allocations happen only when a stall is actually recorded.
- */
-class LagMonitor : public QObject
-{
-    Q_OBJECT
-
-public:
-    struct StallRecord
-    {
-        qint64 timestampMsSinceEpoch = 0; ///< when the stalled period ended
-        qint64 durationMs = 0; ///< approximate length of the freeze; measured tick to tick, so it can exceed the true
-                               ///< stall by up to TICK_INTERVAL_MS
-    };
-
-    static constexpr int TICK_INTERVAL_MS = 500;
-    static constexpr int STALL_THRESHOLD_MS = 2000;
-    static constexpr int MAX_RECORDED_STALLS = 32;
-
-    /// Gaps beyond this are treated as suspend artifacts rather than stalls.
-    static constexpr qint64 MAX_PLAUSIBLE_STALL_MS = 600000;
-
-    explicit LagMonitor(QObject *parent = nullptr);
-
-    /**
-     * @brief Stalls recorded during this session, oldest first.
-     *
-     * Intended consumers are log output and the diagnostics export. The list
-     * holds at most MAX_RECORDED_STALLS entries.
-     */
-    QList<StallRecord> recentStalls() const;
-
-    void clearStalls();
-
-    /**
-     * @brief Feeds a measured tick-to-tick gap through the detection logic.
-     *
-     * Split out of checkTick so threshold, plausibility, and trim behavior
-     * stay unit-testable without real timing.
-     */
-    void recordGap(qint64 gapMs);
-
-protected:
-    bool eventFilter(QObject *obj, QEvent *event) override;
-
-private slots:
-    void checkTick();
-
-private:
-    QTimer *timer;
-    QElapsedTimer tickClock; ///< monotonic clock, so wall clock steps do not fabricate stalls
-    QList<StallRecord> stalls;
-};
-
-#endif
--- a/cockatrice/src/client/latency_graph_widget.cpp
+++ b/cockatrice/src/client/latency_graph_widget.cpp
@ -1,51 +0,0 @@
-/**
- * @file latency_graph_widget.cpp
- * @ingroup Client
- */
-
-#include "latency_graph_widget.h"
-
-#include <QPainter>
-
-LatencyGraphWidget::LatencyGraphWidget(QWidget *parent) : QWidget(parent)
-{
-}
-
-void LatencyGraphWidget::setSamples(const QList<int> &samplesMs)
-{
-    samples = samplesMs;
-    update();
-}
-
-void LatencyGraphWidget::paintEvent(QPaintEvent * /* event */)
-{
-    if (samples.isEmpty()) {
-        return;
-    }
-
-    QPainter painter(this);
-
-    // Heights are relative to the window's own worst sample (floored at
-    // MinScaleMs) so the shape of the variance stays readable even when every
-    // value is small.
-    qint64 heightScaleMs = MinScaleMs;
-    for (int sample : samples) {
-        heightScaleMs = qMax(heightScaleMs, static_cast<qint64>(sample));
-    }
-
-    const qreal widthPerBar = static_cast<qreal>(width()) / samples.size();
-    for (int i = 0; i < samples.size(); ++i) {
-        const qreal heightRatio = qBound(0.0, static_cast<double>(samples.at(i)) / heightScaleMs, 1.0);
-        const qreal barHeight = heightRatio * height();
-
-        // Colors follow an absolute quality ramp: a steady good ping stays
-        // green no matter how uniform the window is.
-        const qreal colorRatio = qBound(0.0, static_cast<double>(samples.at(i)) / ColorScaleMs, 1.0);
-        QColor color;
-        color.setHsv(qRound(120.0 * (1.0 - colorRatio)), 255, 255);
-
-        const QRectF bar(static_cast<qreal>(i) * widthPerBar + 1.0, static_cast<qreal>(height()) - barHeight,
-                         qMax(1.0, widthPerBar - 2.0), barHeight);
-        painter.fillRect(bar, color);
-    }
-}
--- a/cockatrice/src/client/latency_graph_widget.h
+++ b/cockatrice/src/client/latency_graph_widget.h
@ -1,43 +0,0 @@
-/**
- * @file latency_graph_widget.h
- * @ingroup Client
- */
-
-#ifndef LATENCY_GRAPH_WIDGET_H
-#define LATENCY_GRAPH_WIDGET_H
-
-#include <QList>
-#include <QWidget>
-
-/**
- * @brief Bar graph of recent network round-trip samples.
- *
- * Draws one bar per sample, oldest on the left. Bar height is relative to the
- * window's own scale so the shape of the variance stays readable, while bar
- * color maps each sample onto an absolute quality ramp (green at rest through
- * red at ColorScaleMs) so a steady good ping never looks alarming. Size
- * agnostic: the status bar embeds a small instance while the latency detail
- * popup shows a large one.
- */
-class LatencyGraphWidget : public QWidget
-{
-    Q_OBJECT
-public:
-    explicit LatencyGraphWidget(QWidget *parent = nullptr);
-
-    /// Sample in milliseconds that maps to a fully red bar.
-    static constexpr qint64 ColorScaleMs = 500;
-
-    void setSamples(const QList<int> &samplesMs);
-
-protected:
-    void paintEvent(QPaintEvent *event) override;
-
-private:
-    /// Floor of the vertical scale in milliseconds. Keeps small windows readable.
-    static constexpr qint64 MinScaleMs = 100;
-
-    QList<int> samples;
-};
-
-#endif
--- a/cockatrice/src/client/latency_status_widget.cpp
+++ b/cockatrice/src/client/latency_status_widget.cpp
@ -1,111 +0,0 @@
-/**
- * @file latency_status_widget.cpp
- * @ingroup Client
- */
-
-#include "latency_status_widget.h"
-
-#include "latency_graph_widget.h"
-
-#include <QEvent>
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QVBoxLayout>
-
-LatencyStatusWidget::LatencyStatusWidget(QWidget *parent) : QWidget(parent)
-{
-    pingLabel = new QLabel(this);
-    pingLabel->setAccessibleName(tr("Ping"));
-
-    latencyGraph = new LatencyGraphWidget(this);
-    latencyGraph->setFixedSize(90, 14);
-
-    auto *layout = new QHBoxLayout(this);
-    layout->setContentsMargins(0, 0, 0, 0);
-    layout->setSpacing(4);
-    layout->addWidget(latencyGraph);
-    layout->addWidget(pingLabel);
-
-    // Clicking anywhere in the area opens the detail view.
-    for (QObject *child : QList<QObject *>{pingLabel, latencyGraph}) {
-        child->installEventFilter(this);
-    }
-    setCursor(Qt::PointingHandCursor);
-
-    hide();
-}
-
-void LatencyStatusWidget::updateData(const LatencyTracker::Stats &stats, const QList<int> &samplesMs)
-{
-    latestSamples = samplesMs;
-    latencyGraph->setSamples(samplesMs);
-    if (popup && popup->isVisible() && detailGraph) {
-        detailGraph->setSamples(samplesMs);
-    }
-
-    if (stats.sampleCount == 0) {
-        hide();
-        return;
-    }
-
-    const QString statsStr = statsText(stats);
-
-    pingLabel->setText(tr("Ping: %1 ms").arg(stats.lastMs));
-    pingLabel->setToolTip(statsStr);
-    pingLabel->setAccessibleDescription(statsStr);
-    if (popup && popup->isVisible() && detailLabel) {
-        detailLabel->setText(statsStr);
-    }
-    show();
-}
-
-bool LatencyStatusWidget::eventFilter(QObject *watched, QEvent *event)
-{
-    if ((watched == pingLabel || watched == latencyGraph) && event->type() == QEvent::MouseButtonPress) {
-        togglePopup();
-        return true;
-    }
-    return QWidget::eventFilter(watched, event);
-}
-
-void LatencyStatusWidget::togglePopup()
-{
-    if (!popup) {
-        popup = new QWidget(this, Qt::Popup | Qt::FramelessWindowHint);
-        auto *layout = new QVBoxLayout(popup);
-        layout->setContentsMargins(8, 8, 8, 8);
-
-        detailLabel = new QLabel(popup);
-        detailLabel->setAccessibleName(tr("Connection latency details"));
-        detailLabel->setTextInteractionFlags(Qt::TextSelectableByMouse);
-
-        detailGraph = new LatencyGraphWidget(popup);
-        detailGraph->setFixedSize(280, 80);
-
-        layout->addWidget(detailLabel, 0, Qt::AlignLeft);
-        layout->addWidget(detailGraph, 0, Qt::AlignHCenter);
-    }
-
-    if (popup->isVisible()) {
-        popup->hide();
-        return;
-    }
-
-    // Qt::Popup closes itself on any outside click, so just position and show.
-    if (latestSamples.isEmpty()) {
-        return;
-    }
-    detailGraph->setSamples(latestSamples);
-    detailLabel->setText(pingLabel->toolTip());
-    popup->adjustSize();
-    const QPoint anchor = mapToGlobal(QPoint(width() / 2, 0));
-    popup->move(anchor.x() - popup->width() / 2, anchor.y() - popup->height() - 6);
-    popup->show();
-}
-
-QString LatencyStatusWidget::statsText(const LatencyTracker::Stats &stats) const
-{
-    return tr("Connection quality over the last %n sample(s):", "", stats.sampleCount) + "\n" +
-           tr("Last: %1 ms").arg(stats.lastMs) + "\n" + tr("Median: %1 ms").arg(stats.medianMs) + "\n" +
-           tr("95th percentile: %1 ms").arg(stats.p95Ms) + "\n" + tr("Maximum: %1 ms").arg(stats.maxMs);
-}
--- a/cockatrice/src/client/latency_status_widget.h
+++ b/cockatrice/src/client/latency_status_widget.h
@ -1,50 +0,0 @@
-/**
- * @file latency_status_widget.h
- * @ingroup Client
- */
-
-#ifndef LATENCY_STATUS_WIDGET_H
-#define LATENCY_STATUS_WIDGET_H
-
-#include <QList>
-#include <QWidget>
-#include <libcockatrice/network/client/abstract/latency_tracker.h>
-
-class QLabel;
-class LatencyGraphWidget;
-
-/**
- * @brief Status bar presentation of server round-trip health.
- *
- * Combines the textual "Ping" readout with a small LatencyGraphWidget
- * sparkline of the rolling sample window. Clicking anywhere in the area opens
- * a popup with a larger graph and the numeric statistics. It closes on any
- * outside click. Stays hidden while disconnected or before any samples exist.
- * Owns all latency display state so MainWindow only needs to forward one
- * signal here.
- */
-class LatencyStatusWidget : public QWidget
-{
-    Q_OBJECT
-public:
-    explicit LatencyStatusWidget(QWidget *parent = nullptr);
-
-public slots:
-    void updateData(const LatencyTracker::Stats &stats, const QList<int> &samplesMs);
-
-protected:
-    bool eventFilter(QObject *watched, QEvent *event) override;
-
-private:
-    void togglePopup();
-    QString statsText(const LatencyTracker::Stats &stats) const;
-
-    QLabel *pingLabel = nullptr;
-    LatencyGraphWidget *latencyGraph = nullptr;
-    QWidget *popup = nullptr;
-    LatencyGraphWidget *detailGraph = nullptr;
-    QLabel *detailLabel = nullptr;
-    QList<int> latestSamples;
-};
-
-#endif
--- a/cockatrice/src/client/network/connection_controller/remote_connection_controller.cpp
+++ b/cockatrice/src/client/network/connection_controller/remote_connection_controller.cpp
@ -1,6 +1,5 @@
 #include "remote_connection_controller.h"

-#include "../../../interface/pixel_map_generator.h"
 #include "../../settings/cache_settings.h"
 #include "../interface/widgets/dialogs/dlg_connect.h"
 #include "../interface/widgets/dialogs/dlg_forgot_password_challenge.h"
@ -45,8 +44,6 @@ void ConnectionController::wireClientSignals()

    connect(remoteClient, &RemoteClient::statusChanged, this, &ConnectionController::onStatusChanged);

-    connect(remoteClient, &AbstractClient::pingStatsUpdated, this, &ConnectionController::pingStatsUpdated);
-
    connect(remoteClient, &RemoteClient::userInfoChanged, this, &ConnectionController::onUserInfoReceived,
            Qt::BlockingQueuedConnection);

@ -181,7 +178,7 @@ void ConnectionController::onServerShutdownEvent(const Event_ServerShutdown &eve
                                                   "games will be lost.\nReason for shutdown: %1",
                                                   "", event.minutes())
                                                    .arg(QString::fromStdString(event.reason())));
-    serverShutdownMessageBox.setIconPixmap(themePixmap(QStringLiteral("cockatrice")).scaled(64, 64));
+    serverShutdownMessageBox.setIconPixmap(QPixmap("theme:cockatrice").scaled(64, 64));
    serverShutdownMessageBox.setText(tr("Scheduled server shutdown"));
    serverShutdownMessageBox.setWindowModality(Qt::ApplicationModal);
    serverShutdownMessageBox.setVisible(true);
@ -299,15 +296,6 @@ void ConnectionController::onLoginError(int r,
            return;
        }

-        case Response::RespPasswordChangeRequired: {
-            QMessageBox::information(
-                dialogParent, tr("Password Change Required"),
-                tr("An administrator has reset your password. Please contact your server administrator to obtain "
-                   "your temporary password, then log in and change it via Account -> Change Password."));
-            remoteClient->disconnectFromServer();
-            return;
-        }
-
        case Response::RespServerFull: {
            QMessageBox::critical(dialogParent, tr("Server Full"),
                                  tr("The server has reached its maximum user capacity, please check back later."));
--- a/cockatrice/src/client/network/connection_controller/remote_connection_controller.h
+++ b/cockatrice/src/client/network/connection_controller/remote_connection_controller.h
@ -54,10 +54,6 @@ signals:
    // action enable/disable logic
    void statusChanged(ClientStatus status);

-    // Forwarded from AbstractClient::pingStatsUpdated. See that signal for the
-    // meaning of the parameters.
-    void pingStatsUpdated(const LatencyTracker::Stats &stats, const QList<int> &samplesMs);
-
 private slots:
    // Slots wired directly to RemoteClient signals
    void onStatusChanged(ClientStatus status);
--- a/cockatrice/src/client/network/interfaces/deck_stats_interface.cpp
+++ b/cockatrice/src/client/network/interfaces/deck_stats_interface.cpp
@ -72,7 +72,7 @@ void DeckStatsInterface::copyDeckWithoutTokens(const DeckList &source, DeckList
 {
    auto copyIfNotAToken = [&destination](const auto node, const auto card) {
        CardInfoPtr dbCard = CardDatabaseManager::query()->getCardInfo(card->getName());
-        if (dbCard && !dbCard->getIsToken() && node->getName() != DECK_ZONE_MAYBEBOARD) {
+        if (dbCard && !dbCard->getIsToken()) {
            DecklistCardNode *addedCard = destination.addCard(card->getName(), node->getName(), -1);
            addedCard->setNumber(card->getNumber());
        }
--- a/cockatrice/src/client/network/interfaces/tapped_out_interface.cpp
+++ b/cockatrice/src/client/network/interfaces/tapped_out_interface.cpp
@ -99,7 +99,7 @@ void TappedOutInterface::copyDeckSplitMainAndSide(const DeckList &source, DeckLi
 {
    auto copyMainOrSide = [&mainboard, &sideboard](const auto node, const auto card) {
        CardInfoPtr dbCard = CardDatabaseManager::query()->getCardInfo(card->getName());
-        if (!dbCard || dbCard->getIsToken() || node->getName() == DECK_ZONE_MAYBEBOARD) {
+        if (!dbCard || dbCard->getIsToken()) {
            return;
        }

--- a/cockatrice/src/client/settings/shortcuts_settings.h
+++ b/cockatrice/src/client/settings/shortcuts_settings.h
@ -786,10 +786,6 @@ private:
                                       ShortcutGroup::Tabs)},
        {"Tabs/aTabLogs",
         ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Logs"), parseSequenceString(""), ShortcutGroup::Tabs)},
-        {"Tabs/aTabReport",
-         ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Report Queue"), parseSequenceString(""), ShortcutGroup::Tabs)},
-        {"Tabs/aTabModeration",
-         ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Moderation"), parseSequenceString(""), ShortcutGroup::Tabs)},
    };
 };

--- a/cockatrice/src/client/sound_engine.cpp
+++ b/cockatrice/src/client/sound_engine.cpp
@ -94,7 +94,7 @@ QStringMap &SoundEngine::getAvailableThemes()
    QDir dir;
    availableThemes.clear();

-    // Load themes from user profile dir
+    // load themes from user profile dir

    dir.setPath(SettingsCache::instance().getDataPath() + "/sounds");

@ -104,7 +104,7 @@ QStringMap &SoundEngine::getAvailableThemes()
        }
    }

-    // Load themes from Cockatrice system dir
+    // load themes from cockatrice system dir
    dir.setPath(qApp->applicationDirPath() +
 #ifdef Q_OS_MAC
                "/../Resources/sounds"
--- a/cockatrice/src/filters/deck_filter_string.cpp
+++ b/cockatrice/src/filters/deck_filter_string.cpp
@ -43,12 +43,6 @@ NumericValue <- [0-9]+

 static std::once_flag init;

-// The peglib parser is a single permanent object, so the rule actions below cannot see
-// per-instance state. The card language that the nested [[card name]] search matches
-// against is passed through this thread-local context, which is live only while a
-// DeckFilterString is being parsed, and copied into the nested FilterString closures.
-thread_local CardSearchLanguage deckSearchLanguageContext;
-
 static void setupParserRules()
 {
    // plumbing
@ -58,14 +52,18 @@ static void setupParserRules()

    search["Start"] = passthru;
    search["QueryPartList"] = [](const peg::SemanticValues &sv) -> DeckFilter {
-        return [=](const DeckSearchData &data) {
-            auto matchesFilter = [&data](const std::any &query) { return std::any_cast<DeckFilter>(query)(data); };
+        return [=](const DeckPreviewWidget *deck, const ExtraDeckSearchInfo &info) {
+            auto matchesFilter = [&deck, &info](const std::any &query) {
+                return std::any_cast<DeckFilter>(query)(deck, info);
+            };
            return std::all_of(sv.begin(), sv.end(), matchesFilter);
        };
    };
    search["ComplexQueryPart"] = [](const peg::SemanticValues &sv) -> DeckFilter {
-        return [=](const DeckSearchData &data) {
-            auto matchesFilter = [&data](const std::any &query) { return std::any_cast<DeckFilter>(query)(data); };
+        return [=](const DeckPreviewWidget *deck, const ExtraDeckSearchInfo &info) {
+            auto matchesFilter = [&deck, &info](const std::any &query) {
+                return std::any_cast<DeckFilter>(query)(deck, info);
+            };
            return std::any_of(sv.begin(), sv.end(), matchesFilter);
        };
    };
@ -73,7 +71,9 @@ static void setupParserRules()
    search["QueryPart"] = passthru;
    search["NotQuery"] = [](const peg::SemanticValues &sv) -> DeckFilter {
        const auto dependent = std::any_cast<DeckFilter>(sv[0]);
-        return [=](const DeckSearchData &data) -> bool { return !dependent(data); };
+        return [=](const DeckPreviewWidget *deck, const ExtraDeckSearchInfo &info) -> bool {
+            return !dependent(deck, info);
+        };
    };

    search["String"] = [](const peg::SemanticValues &sv) -> QString {
@ -122,12 +122,12 @@ static void setupParserRules()

    // actual functionality
    search["DeckContentQuery"] = [](const peg::SemanticValues &sv) -> DeckFilter {
-        auto cardFilter = FilterString(std::any_cast<QString>(sv[0]), deckSearchLanguageContext);
+        auto cardFilter = FilterString(std::any_cast<QString>(sv[0]));
        auto numberMatcher = sv.size() > 1 ? std::any_cast<NumberMatcher>(sv[1]) : [](int count) { return count > 0; };

-        return [=](const DeckSearchData &data) -> bool {
+        return [=](const DeckPreviewWidget *deck, const ExtraDeckSearchInfo &) -> bool {
            int count = 0;
-            auto cardNodes = data.deck->deckList.getCardNodes();
+            auto cardNodes = deck->deckLoader->getDeck().deckList.getCardNodes();
            for (auto node : cardNodes) {
                auto cardInfoPtr = CardDatabaseManager::query()->getCardInfo(node->getName());
                if (!cardInfoPtr.isNull() && cardFilter.check(cardInfoPtr)) {
@ -146,53 +146,57 @@ static void setupParserRules()

    search["DeckNameQuery"] = [](const peg::SemanticValues &sv) -> DeckFilter {
        auto name = std::any_cast<QString>(sv[0]);
-        return [=](const DeckSearchData &data) {
-            return data.deck->deckList.getName().contains(name, Qt::CaseInsensitive);
+        return [=](const DeckPreviewWidget *deck, const ExtraDeckSearchInfo &) {
+            return deck->deckLoader->getDeck().deckList.getName().contains(name, Qt::CaseInsensitive);
        };
    };

    search["FileNameQuery"] = [](const peg::SemanticValues &sv) -> DeckFilter {
        auto name = std::any_cast<QString>(sv[0]);
-        return [=](const DeckSearchData &data) {
-            auto filename = QFileInfo(data.filePath).fileName();
+        return [=](const DeckPreviewWidget *deck, const ExtraDeckSearchInfo &) {
+            auto filename = QFileInfo(deck->filePath).fileName();
            return filename.contains(name, Qt::CaseInsensitive);
        };
    };

    search["PathQuery"] = [](const peg::SemanticValues &sv) -> DeckFilter {
        auto name = std::any_cast<QString>(sv[0]);
-        return [=](const DeckSearchData &data) { return data.relativeFilePath.contains(name, Qt::CaseInsensitive); };
+        return [=](const DeckPreviewWidget *, const ExtraDeckSearchInfo &info) {
+            return info.relativeFilePath.contains(name, Qt::CaseInsensitive);
+        };
    };

    search["FormatQuery"] = [](const peg::SemanticValues &sv) -> DeckFilter {
        auto format = std::any_cast<QString>(sv[0]);
-        return [=](const DeckSearchData &data) {
-            auto gameFormat = data.deck->deckList.getGameFormat();
+        return [=](const DeckPreviewWidget *deck, const ExtraDeckSearchInfo &) {
+            auto gameFormat = deck->deckLoader->getDeck().deckList.getGameFormat();
            return QString::compare(format, gameFormat, Qt::CaseInsensitive) == 0;
        };
    };

    search["CommentQuery"] = [](const peg::SemanticValues &sv) -> DeckFilter {
        auto value = std::any_cast<QString>(sv[0]);
-        return [=](const DeckSearchData &data) {
-            auto comments = data.deck->deckList.getComments();
+        return [=](const DeckPreviewWidget *deck, const ExtraDeckSearchInfo &) {
+            auto comments = deck->deckLoader->getDeck().deckList.getComments();
            return comments.contains(value, Qt::CaseInsensitive);
        };
    };

    search["GenericQuery"] = [](const peg::SemanticValues &sv) -> DeckFilter {
        auto name = std::any_cast<QString>(sv[0]);
-        return [=](const DeckSearchData &data) { return data.displayName.contains(name, Qt::CaseInsensitive); };
+        return [=](const DeckPreviewWidget *deck, const ExtraDeckSearchInfo &) {
+            return deck->getDisplayName().contains(name, Qt::CaseInsensitive);
+        };
    };
 }

 DeckFilterString::DeckFilterString()
 {
-    filter = [](const DeckSearchData &) { return false; };
+    filter = [](const DeckPreviewWidget *, const ExtraDeckSearchInfo &) { return false; };
    _error = "Not initialized";
 }

-DeckFilterString::DeckFilterString(const QString &expr, const CardSearchLanguage &searchLanguage)
+DeckFilterString::DeckFilterString(const QString &expr)
 {
    QByteArray ba = expr.simplified().toUtf8();

@ -201,18 +205,16 @@ DeckFilterString::DeckFilterString(const QString &expr, const CardSearchLanguage
    _error = QString();

    if (ba.isEmpty()) {
-        filter = [](const DeckSearchData &) { return true; };
+        filter = [](const DeckPreviewWidget *, const ExtraDeckSearchInfo &) { return true; };
        return;
    }

-    deckSearchLanguageContext = searchLanguage;
-
    search.set_logger([&](size_t /*ln*/, size_t col, const std::string &msg) {
        _error = QString("Error at position %1: %2").arg(col).arg(QString::fromStdString(msg));
    });

    if (!search.parse(ba.data(), filter)) {
        qCInfo(DeckFilterStringLog).nospace() << "DeckFilterString error for " << expr << "; " << qPrintable(_error);
-        filter = [](const DeckSearchData &) { return false; };
+        filter = [](const DeckPreviewWidget *, const ExtraDeckSearchInfo &) { return false; };
    }
-}
+}
--- a/cockatrice/src/filters/deck_filter_string.h
+++ b/cockatrice/src/filters/deck_filter_string.h
@ -7,39 +7,35 @@
 #ifndef DECK_FILTER_STRING_H
 #define DECK_FILTER_STRING_H

-#include "../interface/deck_loader/loaded_deck.h"
+#include "../interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.h"

 #include <QLoggingCategory>
 #include <QString>
 #include <functional>
-#include <libcockatrice/card/card_localization.h>

 inline Q_LOGGING_CATEGORY(DeckFilterStringLog, "deck_filter_string");

 /**
- * The data a deck search expression is evaluated against.
- *
- * This is a data view rather than a widget pointer, so the same filter
- * expression can be evaluated against a model or a live widget.
+ * Extra info relevant to filtering that isn't present in the DeckPreviewWidget
 */
-struct DeckSearchData
+struct ExtraDeckSearchInfo
 {
-    const LoadedDeck *deck = nullptr; ///< The loaded deck. Must not be null.
-    QString filePath;                 ///< Absolute path of the deck file.
-    QString displayName;              ///< Deck name, or the file name if the deck has no name.
-    QString relativeFilePath;         ///< File path relative to the deck folder.
+    /**
+     * The relative filepath starting from the deck folder
+     */
+    QString relativeFilePath;
 };

-typedef std::function<bool(const DeckSearchData &data)> DeckFilter;
+typedef std::function<bool(const DeckPreviewWidget *, const ExtraDeckSearchInfo &)> DeckFilter;

 class DeckFilterString
 {
 public:
    DeckFilterString();
-    explicit DeckFilterString(const QString &expr, const CardSearchLanguage &searchLanguage = {});
-    bool check(const DeckSearchData &data) const
+    explicit DeckFilterString(const QString &expr);
+    bool check(const DeckPreviewWidget *deck, const ExtraDeckSearchInfo &info) const
    {
-        return filter(data);
+        return filter(deck, info);
    }

    [[nodiscard]] bool valid() const
--- a/cockatrice/src/filters/filter_builder.cpp
+++ b/cockatrice/src/filters/filter_builder.cpp
@ -1,6 +1,5 @@
 #include "filter_builder.h"

-#include "../interface/pixel_map_generator.h"
 #include "../interface/widgets/utility/custom_line_edit.h"

 #include <QComboBox>
@ -22,7 +21,7 @@ FilterBuilder::FilterBuilder(QWidget *parent) : QWidget(parent)
        typeCombo->addItem(CardFilter::typeName(static_cast<CardFilter::Type>(i)), QVariant(i));
    }

-    QPushButton *ok = new QPushButton(themePixmap(QStringLiteral("icons/increment")), QString());
+    QPushButton *ok = new QPushButton(QPixmap("theme:icons/increment"), QString());
    ok->setObjectName("ok");
    ok->setMaximumSize(20, 20);

--- a/cockatrice/src/game/board/counter_state.cpp
+++ b/cockatrice/src/game/board/counter_state.cpp
@ -13,12 +13,12 @@ CounterState *CounterState::fromProto(const ServerInfo_Counter &counter, QObject
                            convertColorToQColor(counter.counter_color()), counter.radius(), counter.count(), parent);
 }

-void CounterState::setValue(int newValue, bool skipDamageAnimation)
+void CounterState::setValue(int newValue)
 {
    if (newValue == value) {
        return;
    }
    int old = value;
    value = newValue;
-    emit valueChanged(old, newValue, skipDamageAnimation);
+    emit valueChanged(old, newValue);
 }
--- a/cockatrice/src/game/board/counter_state.h
+++ b/cockatrice/src/game/board/counter_state.h
@ -35,23 +35,10 @@ public:
        return value;
    }

-    /**
-     * @brief Set the counter value.
-     * @param newValue The new value.
-     * @param skipDamageAnimation When true, valueChanged is emitted with skipDamageAnimation=true, letting views
-     * suppress damage-related feedback (e.g. battlefield shimmer, life counter flash) for values set during replay
-     * rewinds.
-     */
-    void setValue(int newValue, bool skipDamageAnimation = false);
+    void setValue(int newValue);

 signals:
-    /**
-     * @brief Emitted whenever the value changes.
-     * @param oldValue The previous value.
-     * @param newValue The new value.
-     * @param skipDamageAnimation True when the change should not trigger damage/life-change feedback in views.
-     */
-    void valueChanged(int oldValue, int newValue, bool skipDamageAnimation);
+    void valueChanged(int oldValue, int newValue);

 private:
    int id;
--- a/cockatrice/src/game/game_event_handler.cpp
+++ b/cockatrice/src/game/game_event_handler.cpp
@ -229,11 +229,7 @@ void GameEventHandler::handleArrowDeletion(int creatorId, int arrowId)

 void GameEventHandler::handleArrowDeletionFinished(const Response &response, int creatorId, int arrowId)
 {
-    // The server confirms the arrow no longer exists whether it deleted it itself
-    // (RespOk, followed by an Event_DeleteArrow broadcast) or never had it
-    // (RespNameNotFound). In both cases the local copy has to go. deleteArrow is
-    // a no-op if the arrow was already removed by the event broadcast.
-    if (response.response_code() == Response::RespOk || response.response_code() == Response::RespNameNotFound) {
+    if (response.response_code() == Response::RespNameNotFound) {
        emit arrowDeleted(creatorId, arrowId);
    }
 }
@ -285,19 +281,12 @@ void GameEventHandler::eventGameStateChanged(const Event_GameStateChanged &event
                emit playerJoined(prop);
            }
            player->processPlayerInfo(playerInfo);
-            // Extract playmat from player properties for opponent display
-            if (prop.has_playmat_params()) {
-                player->setPlaymatFromProperties(prop);
-            }
            if (player->getPlayerInfo()->getLocal()) {
                emit localPlayerDeckSelected(player, playerId, playerInfo);
            } else {
                if (!game->getGameMetaInfo()->proto().share_decklists_on_load()) {
                    continue;
                }
-                if (!playerInfo.has_deck_list()) {
-                    continue;
-                }

                opponentDecksToDisplay.append(
                    qMakePair(playerId, qMakePair(playerName, QString::fromStdString(playerInfo.deck_list()))));
@ -355,11 +344,6 @@ void GameEventHandler::eventPlayerPropertiesChanged(const Event_PlayerProperties
    const ServerInfo_PlayerProperties &prop = event.player_properties();
    emit playerPropertiesChanged(prop, eventPlayerId);

-    // Update playmat from player properties
-    if (prop.has_playmat_params()) {
-        player->setPlaymatFromProperties(prop);
-    }
-
    const auto contextType = static_cast<GameEventContext::ContextType>(getPbExtension(context));
    switch (contextType) {
        case GameEventContext::READY_START: {
@ -430,13 +414,12 @@ void GameEventHandler::eventJoin(const Event_Join &event, int /*eventPlayerId*/,
    QString playerName = QString::fromStdString(playerInfo.user_info().name());
    emit addPlayerToAutoCompleteList(playerName);

-    PlayerManager *playerManager = game->getPlayerManager();
-    if (playerManager->getPlayers().contains(playerId) || playerManager->getSpectators().contains(playerId)) {
+    if (game->getPlayerManager()->getPlayers().contains(playerId)) {
        return;
    }

    if (playerInfo.spectator()) {
-        playerManager->addSpectator(playerId, playerInfo);
+        game->getPlayerManager()->addSpectator(playerId, playerInfo);
        emit logJoinSpectator(playerName);
        emit spectatorJoined(playerInfo);
    } else {
--- a/cockatrice/src/game/player/event_processing_options.h
+++ b/cockatrice/src/game/player/event_processing_options.h
@ -13,8 +13,7 @@
 enum EventProcessingOption
 {
    SKIP_REVEAL_WINDOW = 0x0001,
-    SKIP_TAP_ANIMATION = 0x0002,
-    SKIP_DAMAGE_ANIMATION = 0x0004
+    SKIP_TAP_ANIMATION = 0x0002
 };

 // Wrap it in a QFlags typedef
--- a/cockatrice/src/game/player/player_event_handler.cpp
+++ b/cockatrice/src/game/player/player_event_handler.cpp
@ -262,15 +262,14 @@ void PlayerEventHandler::eventCreateCounter(const Event_CreateCounter &event)
    player->addCounter(event.counter_info());
 }

-void PlayerEventHandler::eventSetCounter(const Event_SetCounter &event, EventProcessingOptions options)
+void PlayerEventHandler::eventSetCounter(const Event_SetCounter &event)
 {
    CounterState *ctr = player->getCounters().value(event.counter_id(), nullptr);
    if (!ctr) {
        return;
    }
    int oldValue = ctr->getValue();
-    const bool skipDamageAnimation = options.testFlag(SKIP_DAMAGE_ANIMATION);
-    ctr->setValue(event.value(), skipDamageAnimation);
+    ctr->setValue(event.value());
    emit logSetCounter(player, ctr->getName(), event.value(), oldValue);
 }

@ -626,7 +625,7 @@ void PlayerEventHandler::processGameEvent(GameEvent::GameEventType type,
            eventCreateCounter(event.GetExtension(Event_CreateCounter::ext));
            break;
        case GameEvent::SET_COUNTER:
-            eventSetCounter(event.GetExtension(Event_SetCounter::ext), options);
+            eventSetCounter(event.GetExtension(Event_SetCounter::ext));
            break;
        case GameEvent::DEL_COUNTER:
            eventDelCounter(event.GetExtension(Event_DelCounter::ext));
--- a/cockatrice/src/game/player/player_event_handler.h
+++ b/cockatrice/src/game/player/player_event_handler.h
@ -153,7 +153,7 @@ public:
    void eventCreateCounter(const Event_CreateCounter &event);

    /// Set a player-level counter value.
-    void eventSetCounter(const Event_SetCounter &event, EventProcessingOptions options);
+    void eventSetCounter(const Event_SetCounter &event);

    /// Delete a player-level counter.
    void eventDelCounter(const Event_DelCounter &event);
--- a/cockatrice/src/game/player/player_logic.cpp
+++ b/cockatrice/src/game/player/player_logic.cpp
@ -175,15 +175,7 @@ void PlayerLogic::processPlayerInfo(const ServerInfo_Player &info)
                const ServerInfo_Card &cardInfo = zoneInfo.card_list(j);
                auto *card = new CardItem(this);
                card->processCardInfo(cardInfo);
-                // Zones without coordinates (hand, piles, stack) preserve the order
-                // they arrive in on the server in the positions of their cards list.
-                // The x coordinate of such cards is always 0, so inserting at it
-                // would reverse the list on reconnect. Append instead.
-                if (zoneInfo.with_coords()) {
-                    zone->addCard(card, false, cardInfo.x(), cardInfo.y());
-                } else {
-                    zone->addCard(card, false, -1);
-                }
+                zone->addCard(card, false, cardInfo.x(), cardInfo.y());
            }
        }
        if (zoneInfo.has_always_reveal_top_card()) {
@ -258,22 +250,6 @@ void PlayerLogic::setDeck(const DeckList &_deck)
    emit deckChanged();
 }

-void PlayerLogic::setPlaymatFromProperties(const ServerInfo_PlayerProperties &props)
-{
-    if (props.has_playmat_params() && !props.playmat_params().card_name().empty()) {
-        const auto &pp = props.playmat_params();
-        remotePlaymatCard = {QString::fromStdString(pp.card_name()), QString::fromStdString(pp.card_provider_id())};
-        remotePlaymatParams = {qBound(0.0, pp.margin_pct_l(), 0.95), qBound(0.0, pp.margin_pct_r(), 0.95),
-                               qBound(0.0, pp.vertical_offset(), 1.0), qBound(0.1, pp.zoom(), 4.0)};
-        hasRemotePlaymat = true;
-    } else {
-        remotePlaymatCard = CardRef{};
-        remotePlaymatParams = PlaymatParams{};
-        hasRemotePlaymat = false;
-    }
-    emit playmatChanged();
-}
-
 CounterState *PlayerLogic::addCounter(const ServerInfo_Counter &counter)
 {
    return addCounter(counter.id(), QString::fromStdString(counter.name()),
--- a/cockatrice/src/game/player/player_logic.h
+++ b/cockatrice/src/game/player/player_logic.h
@ -17,7 +17,6 @@
 #include "../zones/table_zone_logic.h"
 #include "player_event_handler.h"
 #include "player_info.h"
-#include "player_manager.h"

 #include <QInputDialog>
 #include <QLoggingCategory>
@ -73,8 +72,6 @@ signals:
                                 const QList<const ServerInfo_Card *> &cardList,
                                 bool withWritePermission);
    void deckChanged();
-    /** @brief Emitted when the remote playmat (card/params) is updated from player properties. */
-    void playmatChanged();
    void newCardAdded(AbstractCardItem *card);
    void requestCardMenuUpdate(const CardItem *card);
    void counterAdded(CounterState *state);
@ -229,20 +226,6 @@ public:

    void setZoneId(int _zoneId);

-    void setPlaymatFromProperties(const ServerInfo_PlayerProperties &props);
-    const CardRef &getRemotePlaymatCard() const
-    {
-        return remotePlaymatCard;
-    }
-    const PlaymatParams &getRemotePlaymatParams() const
-    {
-        return remotePlaymatParams;
-    }
-    bool getHasRemotePlaymat() const
-    {
-        return hasRemotePlaymat;
-    }
-
 private:
    AbstractGame *game;
    PlayerInfo *playerInfo;
@ -260,11 +243,6 @@ private:

    bool dialogSemaphore;
    QList<CardItem *> cardsToDelete;
-
-    // Playmat from player properties (for opponent display)
-    CardRef remotePlaymatCard;
-    PlaymatParams remotePlaymatParams;
-    bool hasRemotePlaymat = false;
 };

 class AnnotationDialog : public QInputDialog
--- a/cockatrice/src/game/player/player_manager.cpp
+++ b/cockatrice/src/game/player/player_manager.cpp
@ -75,14 +75,6 @@ PlayerLogic *PlayerManager::getPlayer(int playerId) const
    return player;
 }

-void PlayerManager::clearSpectators()
-{
-    const QList<int> spectatorIds = spectators.keys();
-    for (int spectatorId : spectatorIds) {
-        removeSpectator(spectatorId);
-    }
-}
-
 void PlayerManager::onPlayerConceded(int playerId, bool conceded)
 {
    // Everything else cares about this
--- a/cockatrice/src/game/player/player_manager.h
+++ b/cockatrice/src/game/player/player_manager.h
@ -100,9 +100,6 @@ public:
        emit spectatorRemoved(spectatorId, spectatorInfo);
    }

-    /** @brief Remove all spectators, emitting the removal signal for each. */
-    void clearSpectators();
-
    [[nodiscard]] AbstractGame *getGame() const
    {
        return game;
--- a/cockatrice/src/game_graphics/animated_item.h
+++ b/cockatrice/src/game_graphics/animated_item.h
@ -1,26 +0,0 @@
-#ifndef ANIMATED_ITEM_H
-#define ANIMATED_ITEM_H
-
-/**
- * @file animated_item.h
- * @ingroup GameGraphics
- * @brief Interface for scene items driven by GameScene's shared animation timer.
- *
- * Items that want per-tick animation while a single QBasicTimer runs (instead of
- * owning their own QTimer) implement this interface and register with the scene
- * via GameScene::registerAnimationItem.
- */
-
-class IAnimatedItem
-{
-public:
-    virtual ~IAnimatedItem() = default;
-
-    /**
-     * @brief Advances the item's animation by one timer tick.
-     * @return true while the animation is still running, false once it has finished.
-     */
-    virtual bool animationEvent() = 0;
-};
-
-#endif
--- a/cockatrice/src/game_graphics/board/abstract_card_item.cpp
+++ b/cockatrice/src/game_graphics/board/abstract_card_item.cpp
@ -1,7 +1,6 @@
 #include "abstract_card_item.h"

 #include "../../client/settings/cache_settings.h"
-#include "../../interface/card_localization.h"
 #include "../../interface/card_picture_loader/card_picture_loader.h"
 #include "../game_scene.h"
 #include "../z_values.h"
@ -27,8 +26,6 @@ AbstractCardItem::AbstractCardItem(QGraphicsItem *parent, const CardRef &cardRef

    connect(&SettingsCache::instance().cardsDisplay(), &CardsDisplaySettings::displayCardNamesChanged, this,
            [this] { update(); });
-    connect(&SettingsCache::instance().cardsDisplay(), &CardsDisplaySettings::cardLangChanged, this,
-            [this] { update(); });
    refreshCardInfo();

    connect(&SettingsCache::instance().cardsDisplay(), &CardsDisplaySettings::roundCardCornersChanged, this,
@ -174,7 +171,7 @@ void AbstractCardItem::paintPicture(QPainter *painter, const QSizeF &translatedS
            if (SettingsCache::instance().debug().getShowCardId()) {
                prefix = "#" + QString::number(id) + " ";
            }
-            nameStr = prefix + CardLocalization::displayName(getCardInfo());
+            nameStr = prefix + cardRef.name;
        }
        painter->drawText(QRectF(3 * scaleFactor, 3 * scaleFactor, translatedSize.width() - 6 * scaleFactor,
                                 translatedSize.height() - 6 * scaleFactor),
@ -308,11 +305,6 @@ void AbstractCardItem::setTapped(bool _tapped, bool canAnimate)
    }
 }

-bool AbstractCardItem::animationEvent()
-{
-    return false;
-}
-
 void AbstractCardItem::setFaceDown(bool _facedown)
 {
    facedown = _facedown;
--- a/cockatrice/src/game_graphics/board/abstract_card_item.h
+++ b/cockatrice/src/game_graphics/board/abstract_card_item.h
@ -7,7 +7,6 @@
 #ifndef ABSTRACTCARDITEM_H
 #define ABSTRACTCARDITEM_H

-#include "../animated_item.h"
 #include "../card_dimensions.h"
 #include "arrow_target.h"
 #include "graphics_item_type.h"
@ -17,7 +16,7 @@

 class PlayerLogic;

-class AbstractCardItem : public ArrowTarget, public IAnimatedItem
+class AbstractCardItem : public ArrowTarget
 {
    Q_OBJECT
 protected:
@ -127,9 +126,6 @@ public:
        emit deleteCardInfoPopup(cardRef.name);
    }

-    /** @brief Default: no per-tick animation. Subclasses override to animate. */
-    bool animationEvent() override;
-
 protected:
    void transformPainter(QPainter *painter, const QSizeF &translatedSize, int angle);
    void mousePressEvent(QGraphicsSceneMouseEvent *event) override;
--- a/cockatrice/src/game_graphics/board/abstract_counter.cpp
+++ b/cockatrice/src/game_graphics/board/abstract_counter.cpp
@ -29,9 +29,8 @@ AbstractCounter::AbstractCounter(CounterState *state,
 {
    setAcceptHoverEvents(true);

-    connect(state, &CounterState::valueChanged, this, [this](int oldValue, int newValue, bool skipDamageAnimation) {
+    connect(state, &CounterState::valueChanged, this, [this](int, int newValue) {
        value = newValue;
-        onValueChanged(oldValue, newValue, skipDamageAnimation);
        update();
    });

@ -229,9 +228,3 @@ void AbstractCounterDialog::changeValue(int diff)
    curValue += diff;
    setTextValue(QString::number(curValue));
 }
-
-void AbstractCounter::onValueChanged(int /*oldValue*/, int /*newValue*/, bool /*skipDamageAnimation*/)
-{
-    // Default: no feedback. Subclasses such as PlayerCounter override this to
-    // flash the counter on meaningful changes (life gain/loss).
-}
--- a/cockatrice/src/game_graphics/board/abstract_counter.h
+++ b/cockatrice/src/game_graphics/board/abstract_counter.h
@ -35,14 +35,6 @@ protected:
    bool hovered = false;
    bool useNameForShortcut;

-    /**
-     * @brief Hook for subclasses that need per-value-change feedback (e.g. life-total flash).
-     *
-     * Called whenever the counter's value changes, before the item repaints.
-     * @param skipDamageAnimation True when damage-related feedback should be suppressed (replay rewinds).
-     */
-    virtual void onValueChanged(int oldValue, int newValue, bool skipDamageAnimation);
-
    void mousePressEvent(QGraphicsSceneMouseEvent *event) override;
    void hoverEnterEvent(QGraphicsSceneHoverEvent *event) override;
    void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) override;
--- a/cockatrice/src/game_graphics/board/arrow_item.cpp
+++ b/cockatrice/src/game_graphics/board/arrow_item.cpp
@ -4,14 +4,12 @@
 #include "../../client/settings/cache_settings.h"
 #include "../../game/player/player_actions.h"
 #include "../../game/player/player_logic.h"
-#include "../game_scene.h"
 #include "../player/player_target.h"
 #include "../z_values.h"
 #include "../zones/card_zone.h"
 #include "card_item.h"

 #include <QDebug>
-#include <QElapsedTimer>
 #include <QGraphicsScene>
 #include <QGraphicsSceneMouseEvent>
 #include <QPainter>
@ -20,27 +18,10 @@
 #include <libcockatrice/protocol/pb/command_attach_card.pb.h>
 #include <libcockatrice/protocol/pb/command_create_arrow.pb.h>
 #include <libcockatrice/protocol/pb/command_delete_arrow.pb.h>
-#include <libcockatrice/settings/cards_display_settings.h>
 #include <libcockatrice/settings/interface_settings.h>
 #include <libcockatrice/utility/color.h>
 #include <libcockatrice/utility/zone_names.h>

-namespace
-{
-constexpr qreal kMinStrokeDurationMs = 200.0;
-constexpr qreal kMaxStrokeDurationMs = 450.0;
-constexpr qreal kMsPerPixel = 0.8;
-constexpr qreal kGlowFadeDurationMs = 120.0;
-constexpr qreal kSheenHalfWidth = 14.0;
-
-/// @brief Ease-out cubic, for a natural "slow in / slow out" reveal.
-qreal easeOutCubic(qreal t)
-{
-    const qreal inverse = 1.0 - t;
-    return 1.0 - inverse * inverse * inverse;
-}
-} // namespace
-
 ArrowItem::ArrowItem(QSharedPointer<const ArrowData> _data, ArrowTarget *_startItem, ArrowTarget *_targetItem)
    : data(std::move(_data)), startItem(_startItem), targetItem(_targetItem)
 {
@ -66,23 +47,8 @@ ArrowItem::ArrowItem(QSharedPointer<const ArrowData> _data, ArrowTarget *_startI
    }
 }

-ArrowItem::~ArrowItem()
-{
-    if (auto *scene = qobject_cast<GameScene *>(this->scene())) {
-        scene->unregisterAnimationItem(this);
-    }
-}
-
 void ArrowItem::onTargetDestroyed()
 {
-    if (data->id == -1) {
-        // Drag and attach arrows are never inserted into the arrow registry and
-        // have no server-side counterpart, so no deletion event can clean them
-        // up. Delete them locally when either endpoint is destroyed.
-        delArrow();
-        return;
-    }
-
    emit requestDeletion(data->creatorId, data->id);
 }

@ -125,21 +91,16 @@ void ArrowItem::updatePath(const QPointF &endPoint)
    prepareGeometryChange();
    if (lineLength < 30) {
        path = QPainterPath();
-        bodyPath = QPainterPath();
-        headPath = QPainterPath();
-        shaftOutlinePath = QPainterPath();
-        centerLine = QPainterPath();
-        headBaseFraction = 1.0;
    } else {
        QPointF c(lineLength / 2, qTan(phi * M_PI / 180) * lineLength);

-        centerLine = QPainterPath();
+        QPainterPath centerLine;
        centerLine.moveTo(0, 0);
        centerLine.quadTo(c, QPointF(lineLength, 0));

-        headBaseFraction = 1 - headLength / lineLength;
-        QPointF arrowBodyEndPoint = centerLine.pointAtPercent(headBaseFraction);
-        QLineF testLine(arrowBodyEndPoint, centerLine.pointAtPercent(headBaseFraction + 0.001));
+        double percentage = 1 - headLength / lineLength;
+        QPointF arrowBodyEndPoint = centerLine.pointAtPercent(percentage);
+        QLineF testLine(arrowBodyEndPoint, centerLine.pointAtPercent(percentage + 0.001));
        qreal alpha = testLine.angle() - 90;
        QPointF endPoint1 =
            arrowBodyEndPoint + arrowWidth / 2 * QPointF(qCos(alpha * M_PI / 180), -qSin(alpha * M_PI / 180));
@ -150,89 +111,20 @@ void ArrowItem::updatePath(const QPointF &endPoint)
        QPointF point2 =
            endPoint2 + (headWidth - arrowWidth) / 2 * QPointF(-qCos(alpha * M_PI / 180), qSin(alpha * M_PI / 180));

-        QPointF start1 = -arrowWidth / 2 * QPointF(qCos((phi - 90) * M_PI / 180), qSin((phi - 90) * M_PI / 180));
-        QPointF start2 = arrowWidth / 2 * QPointF(qCos((phi - 90) * M_PI / 180), qSin((phi - 90) * M_PI / 180));
-
-        path = QPainterPath(start1);
+        path = QPainterPath(-arrowWidth / 2 * QPointF(qCos((phi - 90) * M_PI / 180), qSin((phi - 90) * M_PI / 180)));
        path.quadTo(c, endPoint1);
        path.lineTo(point1);
        path.lineTo(QPointF(lineLength, 0));
        path.lineTo(point2);
        path.lineTo(endPoint2);
-        path.quadTo(c, start2);
-        path.lineTo(start1);
-
-        bodyPath = QPainterPath(start1);
-        bodyPath.quadTo(c, endPoint1);
-        bodyPath.lineTo(endPoint2);
-        bodyPath.quadTo(c, start2);
-        bodyPath.lineTo(start1);
-
-        headPath = QPainterPath(endPoint1);
-        headPath.lineTo(point1);
-        headPath.lineTo(QPointF(lineLength, 0));
-        headPath.lineTo(point2);
-        headPath.lineTo(endPoint2);
-
-        shaftOutlinePath = QPainterPath(start1);
-        shaftOutlinePath.quadTo(c, endPoint1);
-        shaftOutlinePath.moveTo(endPoint2);
-        shaftOutlinePath.quadTo(c, start2);
-        shaftOutlinePath.lineTo(start1);
+        path.quadTo(c, arrowWidth / 2 * QPointF(qCos((phi - 90) * M_PI / 180), qSin((phi - 90) * M_PI / 180)));
+        path.lineTo(-arrowWidth / 2 * QPointF(qCos((phi - 90) * M_PI / 180), qSin((phi - 90) * M_PI / 180)));
    }

    setPos(startPoint);
    setTransform(QTransform().rotate(-line.angle()));
 }

-void ArrowItem::startDrawAnimation()
-{
-    if (!SettingsCache::instance().cardsDisplay().getArrowDrawAnimation() || centerLine.isEmpty()) {
-        return;
-    }
-
-    strokeDurationMs = qBound(kMinStrokeDurationMs, centerLine.length() * kMsPerPixel, kMaxStrokeDurationMs);
-    glowFadeDurationMs = kGlowFadeDurationMs;
-    // The clock is started on the first animationEvent() tick so that t=0
-    // corresponds to the first rendered frame. Starting it here would count
-    // the time spent before the item's first paint (event-loop delays, bursts
-    // of arrows created together), making the arrow appear already partway
-    // drawn when it first shows up.
-    animationStarted = false;
-    drawProgress = 0.0;
-    glowAlpha = 1.0;
-    update();
-    if (auto *scene = qobject_cast<GameScene *>(this->scene())) {
-        scene->registerAnimationItem(this);
-    }
-}
-
-bool ArrowItem::animationEvent()
-{
-    if (!animationStarted) {
-        animationClock.start();
-        animationStarted = true;
-    }
-
-    const qint64 elapsed = animationClock.elapsed();
-    if (elapsed >= strokeDurationMs + glowFadeDurationMs) {
-        drawProgress = 1.0;
-        glowAlpha = 0.0;
-        update();
-        return false;
-    }
-
-    if (elapsed < strokeDurationMs) {
-        drawProgress = easeOutCubic(qBound<qreal>(0.0, elapsed / strokeDurationMs, 1.0));
-        glowAlpha = 1.0;
-    } else {
-        drawProgress = 1.0;
-        glowAlpha = 1.0 - (elapsed - strokeDurationMs) / glowFadeDurationMs;
-    }
-    update();
-    return true;
-}
-
 void ArrowItem::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*option*/, QWidget * /*widget*/)
 {
    QColor paintColor(data->color);
@ -241,66 +133,8 @@ void ArrowItem::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*opti
    } else {
        paintColor.setAlpha(150);
    }
-
-    painter->save();
-    const QPen outlinePen = painter->pen();
    painter->setBrush(paintColor);
-
-    const auto drawShaft = [this, painter, &outlinePen, paintColor]() {
-        painter->setPen(Qt::NoPen);
-        painter->drawPath(bodyPath);
-        painter->setPen(outlinePen);
-        painter->setBrush(Qt::NoBrush);
-        painter->drawPath(shaftOutlinePath);
-        painter->setBrush(paintColor);
-    };
-
-    if (drawProgress >= 1.0 || path.isEmpty()) {
-        painter->drawPath(path);
-    } else if (drawProgress < headBaseFraction) {
-        // The reveal edge and the sheen share the same arc-length parameterization,
-        // so the stroke stays exactly in sync with the trailing sheen.
-        const qreal revealX = centerLine.pointAtPercent(drawProgress).x();
-        QPainterPath clip;
-        clip.addRect(QRectF(-glowExtent, path.boundingRect().top() - glowExtent, revealX + glowExtent,
-                            path.boundingRect().height() + 2 * glowExtent));
-        painter->setClipPath(clip);
-        drawShaft();
-    } else {
-        // Once the reveal reaches the head base, pop the whole head in with a fade
-        // instead of slicing the triangle into a growing stub.
-        drawShaft();
-        const qreal headFadeIn = (drawProgress - headBaseFraction) / (1.0 - headBaseFraction);
-        painter->setOpacity(headFadeIn);
-        painter->setPen(Qt::NoPen);
-        painter->drawPath(headPath);
-        painter->setPen(outlinePen);
-        painter->setBrush(Qt::NoBrush);
-        painter->drawPath(headPath);
-        painter->setOpacity(1.0);
-        painter->setBrush(paintColor);
-    }
-
-    if (glowAlpha > 0.0 && !centerLine.isEmpty()) {
-        // Sweep a bright band across the arrow. Clipping to the
-        // silhouette keeps it flat against the shaft so it reads as a light reflection.
-        const qreal anticipation = qMin<qreal>(1.0, drawProgress / 0.08);
-        const QPointF sweep = centerLine.pointAtPercent(qMin<qreal>(drawProgress, 1.0));
-        QLinearGradient sheen(sweep.x() - kSheenHalfWidth, 0.0, sweep.x() + kSheenHalfWidth, 0.0);
-        sheen.setColorAt(0.0, QColor(paintColor.red(), paintColor.green(), paintColor.blue(), 0));
-        sheen.setColorAt(0.5, QColor(255, 255, 255, 200));
-        sheen.setColorAt(1.0, QColor(paintColor.red(), paintColor.green(), paintColor.blue(), 0));
-        painter->save();
-        painter->setPen(Qt::NoPen);
-        painter->setClipPath(path);
-        painter->setBrush(sheen);
-        painter->setOpacity(glowAlpha * anticipation);
-        painter->drawRect(QRectF(sweep.x() - kSheenHalfWidth - glowExtent, path.boundingRect().top() - glowExtent,
-                                 (kSheenHalfWidth + glowExtent) * 2.0,
-                                 path.boundingRect().height() + glowExtent * 2.0));
-        painter->restore();
-    }
-    painter->restore();
+    painter->drawPath(path);
 }

 void ArrowItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
@ -392,12 +226,6 @@ void ArrowDragItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
 void ArrowDragItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
 {
    if (!startItem) {
-        // The source card was destroyed while the arrow was being drawn.
-        // Clean up the arrow and its children instead of leaking them.
-        delArrow();
-        for (auto *child : childArrows) {
-            child->mouseReleaseEvent(event);
-        }
        return;
    }

@ -521,12 +349,6 @@ void ArrowAttachItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
 void ArrowAttachItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
 {
    if (!startItem) {
-        // The source card was destroyed while the arrow was being drawn.
-        // Clean up the arrow and its children instead of leaking them.
-        delArrow();
-        for (auto *child : childArrows) {
-            child->mouseReleaseEvent(event);
-        }
        return;
    }

--- a/cockatrice/src/game_graphics/board/arrow_item.h
+++ b/cockatrice/src/game_graphics/board/arrow_item.h
@ -2,13 +2,9 @@
 #define ARROWITEM_H

 #include "../../game/board/arrow_data.h"
-#include "../animated_item.h"
 #include "arrow_target.h"
-#include "graphics_item_type.h"

-#include <QElapsedTimer>
 #include <QGraphicsItem>
-#include <QPainterPath>
 #include <QPointer>
 #include <QSharedPointer>

@ -16,7 +12,7 @@ class CardItem;
 class QGraphicsSceneMouseEvent;
 class PlayerLogic;

-class ArrowItem : public QObject, public QGraphicsItem, public IAnimatedItem
+class ArrowItem : public QObject, public QGraphicsItem
 {
    Q_OBJECT
    Q_INTERFACES(QGraphicsItem)
@ -25,19 +21,6 @@ signals:

 private:
    QPainterPath path;
-    QPainterPath bodyPath;
-    QPainterPath headPath;
-    QPainterPath shaftOutlinePath;
-    QPainterPath centerLine;
-    qreal headBaseFraction = 1.0;
-    QElapsedTimer animationClock;
-    qreal strokeDurationMs = 0;
-    qreal glowFadeDurationMs = 0;
-    qreal drawProgress = 1.0;
-    qreal glowAlpha = 0.0;
-    bool animationStarted = false;
-
-    static constexpr qreal glowExtent = 12.0;

 protected:
    QSharedPointer<const ArrowData> data;
@ -49,28 +32,17 @@ protected:
    void mousePressEvent(QGraphicsSceneMouseEvent *event) override;

 public:
-    enum
-    {
-        Type = typeArrow
-    };
-    [[nodiscard]] int type() const override
-    {
-        return Type;
-    }
    ArrowItem(QSharedPointer<const ArrowData> _data, ArrowTarget *_startItem, ArrowTarget *_targetItem);
-    ~ArrowItem() override;

    void onTargetDestroyed();
    void delArrow();
    void updatePath();
    void updatePath(const QPointF &endPoint);
-    void startDrawAnimation();
-    bool animationEvent() override;

    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
    [[nodiscard]] QRectF boundingRect() const override
    {
-        return path.boundingRect().adjusted(-glowExtent, -glowExtent, glowExtent, glowExtent);
+        return path.boundingRect();
    }
    [[nodiscard]] QPainterPath shape() const override
    {
@ -134,4 +106,4 @@ protected:
    void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override;
 };

-#endif
+#endif
--- a/cockatrice/src/game_graphics/board/card_item.cpp
+++ b/cockatrice/src/game_graphics/board/card_item.cpp
@ -316,7 +316,7 @@ void CardItem::drawAttachArrow()

    for (const auto &item : scene()->selectedItems()) {
        CardItem *card = qgraphicsitem_cast<CardItem *>(item);
-        if (card == nullptr || card == this) {
+        if (card == nullptr) {
            continue;
        }
        if (card->getZone() != state->getZone()) {
--- a/cockatrice/src/game_graphics/board/card_item.h
+++ b/cockatrice/src/game_graphics/board/card_item.h
@ -137,7 +137,7 @@ public:
    void resetState(bool keepAnnotations = false);
    void processCardInfo(const ServerInfo_Card &_info);

-    bool animationEvent() override;
+    bool animationEvent();
    CardDragItem *createDragItem(int _id, const QPointF &_pos, const QPointF &_scenePos, bool forceFaceDown);
    void deleteDragItem();
    void drawArrow(const QColor &arrowColor);
--- a/cockatrice/src/game_graphics/board/graphics_item_type.h
+++ b/cockatrice/src/game_graphics/board/graphics_item_type.h
@ -16,8 +16,7 @@ enum GraphicsItemType
    typeZone = QGraphicsItem::UserType + 3,
    typePlayerTarget = QGraphicsItem::UserType + 4,
    typeDeckViewCardContainer = QGraphicsItem::UserType + 5,
-    typeOther = QGraphicsItem::UserType + 6,
-    typeArrow = QGraphicsItem::UserType + 7
+    typeOther = QGraphicsItem::UserType + 6
 };

 #endif // COCKATRICE_GRAPHICS_ITEM_TYPE_H
--- a/cockatrice/src/game_graphics/deckview/deck_view.cpp
+++ b/cockatrice/src/game_graphics/deckview/deck_view.cpp
@ -10,6 +10,7 @@
 #include <algorithm>
 #include <libcockatrice/card/card_info.h>
 #include <libcockatrice/deck_list/deck_list.h>
+#include <libcockatrice/deck_list/tree/deck_list_card_node.h>
 #include <libcockatrice/settings/cards_display_settings.h>

 DeckViewCardDragItem::DeckViewCardDragItem(DeckViewCard *_item,
@ -380,10 +381,12 @@ void DeckViewScene::rebuildTree()
            addItem(container);
        }

-        // Cards in custom zones nested under a board are regular board cards in-game.
-        // They are collected recursively (like every other consumer) and reported with
-        // the top-level board zone as their origin, so that sideboard plans keep working.
-        for (auto *currentCard : deck->getCardNodes({currentZone->getName()})) {
+        for (int j = 0; j < currentZone->size(); j++) {
+            auto *currentCard = dynamic_cast<DecklistCardNode *>(currentZone->at(j));
+            if (!currentCard) {
+                continue;
+            }
+
            for (int k = 0; k < currentCard->getNumber(); ++k) {
                auto *newCard = new DeckViewCard(container, currentCard->toCardRef(), currentZone->getName());
                container->addCard(newCard);
--- a/cockatrice/src/game_graphics/deckview/deck_view_container.cpp
+++ b/cockatrice/src/game_graphics/deckview/deck_view_container.cpp
@ -9,21 +9,17 @@
 #include "../../interface/widgets/dialogs/dlg_load_deck_from_website.h"
 #include "../../interface/widgets/dialogs/dlg_load_remote_deck.h"
 #include "../../interface/widgets/tabs/tab_game.h"
-#include "../../interface/widgets/visual_deck_storage/visual_deck_storage_widget.h"
 #include "deck_view.h"

 #include <QMessageBox>
 #include <libcockatrice/card/database/card_database.h>
 #include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/deck_list/playmat_resolver.h>
 #include <libcockatrice/protocol/pb/command_deck_select.pb.h>
 #include <libcockatrice/protocol/pb/command_ready_start.pb.h>
-#include <libcockatrice/protocol/pb/command_set_playmat.pb.h>
 #include <libcockatrice/protocol/pb/command_set_sideboard_lock.pb.h>
 #include <libcockatrice/protocol/pb/command_set_sideboard_plan.pb.h>
 #include <libcockatrice/protocol/pb/response_deck_download.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
-#include <libcockatrice/settings/interface_settings.h>
 #include <libcockatrice/settings/visual_deck_storage_settings.h>
 #include <libcockatrice/utility/string_limits.h>

@ -104,9 +100,6 @@ DeckViewContainer::DeckViewContainer(int _playerId, TabGame *parent)
    connect(&SettingsCache::instance().visualDeckStorage(), &VisualDeckStorageSettings::visualDeckStorageInGameChanged,
            this, &DeckViewContainer::setVisualDeckStorageExists);

-    connect(&SettingsCache::instance().userInterface(), &InterfaceSettings::playmatSettingsChanged, this,
-            &DeckViewContainer::onPlaymatSettingsChanged);
-
    switchToDeckSelectView();
 }

@ -284,8 +277,6 @@ void DeckViewContainer::loadDeckFromFile(const QString &filePath)

 void DeckViewContainer::loadDeckFromDeckList(const DeckList &deck)
 {
-    currentDeck = deck;
-
    QString deckString = deck.writeToString_Native();

    if (deckString.length() > MAX_FILE_LENGTH) {
@ -298,52 +289,6 @@ void DeckViewContainer::loadDeckFromDeckList(const DeckList &deck)
    PendingCommand *pend = parentGame->getGame()->getGameEventHandler()->prepareGameCommand(cmd);
    connect(pend, &PendingCommand::finished, this, &DeckViewContainer::deckSelectFinished);
    parentGame->getGame()->getGameEventHandler()->sendGameCommand(pend, playerId);
-
-    resolveAndSendPlaymat();
-}
-
-void DeckViewContainer::resolveAndSendPlaymat()
-{
-    if (currentDeck.getCardRefList().isEmpty() && currentDeck.getPlaymat().card.isEmpty()) {
-        return;
-    }
-
-    const auto &settings = SettingsCache::instance().userInterface();
-    const auto fallbackBehavior = static_cast<PlaymatFallbackMode>(settings.getPlaymatFallbackBehavior());
-
-    QList<PlaymatInfo> fallbackList = settings.getPlaymatFallbackList();
-
-    // In random mode with 2+ entries, remove the last-resolved mat to avoid repeats.
-    if (fallbackBehavior == PlaymatFallbackModeRandom && fallbackList.size() > 1) {
-        fallbackList.removeAll(lastResolvedPlaymat);
-    }
-
-    const PlaymatInfo resolved =
-        resolvePlaymatForDeck(currentDeck, fallbackList, static_cast<PlaymatMode>(settings.getPlaymatMode()),
-                              fallbackBehavior, playmatRotationIndex);
-
-    lastResolvedPlaymat = resolved;
-
-    Command_SetPlaymat playmatCmd;
-    auto *pp = playmatCmd.mutable_playmat_params();
-    pp->set_card_name(resolved.card.name.toStdString());
-    pp->set_card_provider_id(resolved.card.providerId.toStdString());
-    pp->set_margin_pct_l(resolved.params.marginPctL);
-    pp->set_margin_pct_r(resolved.params.marginPctR);
-    pp->set_vertical_offset(resolved.params.verticalOffset);
-    pp->set_zoom(resolved.params.zoom);
-    PendingCommand *playmatPend = parentGame->getGame()->getGameEventHandler()->prepareGameCommand(playmatCmd);
-    parentGame->getGame()->getGameEventHandler()->sendGameCommand(playmatPend, playerId);
-}
-
-void DeckViewContainer::onPlaymatSettingsChanged()
-{
-    resolveAndSendPlaymat();
-}
-
-void DeckViewContainer::advancePlaymatRotation()
-{
-    playmatRotationIndex++;
 }

 void DeckViewContainer::loadRemoteDeck()
@ -434,10 +379,6 @@ void DeckViewContainer::sideboardPlanChanged()
 */
 void DeckViewContainer::sendReadyStartCommand(bool ready)
 {
-    if (ready) {
-        resolveAndSendPlaymat();
-    }
-
    Command_ReadyStart cmd;
    cmd.set_ready(ready);
    parentGame->getGame()->getGameEventHandler()->sendGameCommand(cmd, playerId);
@ -475,7 +416,6 @@ void DeckViewContainer::setSideboardLocked(bool locked)

 void DeckViewContainer::setDeck(const DeckList &deck)
 {
-    currentDeck = deck;
    deckView->setDeck(deck);
    switchToDeckLoadedView();
 }
--- a/cockatrice/src/game_graphics/deckview/deck_view_container.h
+++ b/cockatrice/src/game_graphics/deckview/deck_view_container.h
@ -57,9 +57,6 @@ private:
    VisualDeckStorageWidget *visualDeckStorageWidget;
    TabGame *parentGame;
    int playerId;
-    int playmatRotationIndex = 0;    ///< Per-match cursor for round-robin playmat mode.
-    DeckList currentDeck;            ///< Cached deck for live settings re-resolution.
-    PlaymatInfo lastResolvedPlaymat; ///< Tracks last sent playmat to avoid repeats in random mode.

    void tryCreateVisualDeckStorageWidget();
    void sendReadyStartCommand(bool ready);
@ -78,7 +75,6 @@ private slots:
    void sideboardLockButtonClicked();
    void updateSideboardLockButtonText();
    void refreshShortcuts();
-    void onPlaymatSettingsChanged();
 signals:
    void newCardAdded(AbstractCardItem *card);
    void notIdle();
@ -91,8 +87,6 @@ public:
    void setSideboardLocked(bool locked);
    void setDeck(const DeckList &deck);
    void setVisualDeckStorageExists(bool exists);
-    void advancePlaymatRotation();
-    void resolveAndSendPlaymat();

 public slots:
    void loadDeckFromFile(const QString &filePath);
--- a/cockatrice/src/game_graphics/dialogs/dlg_create_token.cpp
+++ b/cockatrice/src/game_graphics/dialogs/dlg_create_token.cpp
@ -16,13 +16,11 @@
 #include <QLineEdit>
 #include <QRadioButton>
 #include <QTreeView>
-#include <libcockatrice/card/card_localization.h>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/deck_list/deck_list.h>
 #include <libcockatrice/models/database/card_database_model.h>
 #include <libcockatrice/models/database/token/token_display_model.h>
 #include <libcockatrice/settings/card_override_settings.h>
-#include <libcockatrice/settings/cards_display_settings.h>
 #include <libcockatrice/settings/interface_settings.h>
 #include <libcockatrice/settings/layouts_settings.h>
 #include <libcockatrice/utility/string_limits.h>
@ -90,17 +88,6 @@ DlgCreateToken::DlgCreateToken(const QStringList &_predefinedTokens, QWidget *pa
    cardDatabaseDisplayModel = new TokenDisplayModel(this);
    cardDatabaseDisplayModel->setSourceModel(cardDatabaseModel);

-    const auto applyCardSearchLanguage = [this]() {
-        const CardsDisplaySettings &cardsDisplay = SettingsCache::instance().cardsDisplay();
-        cardDatabaseDisplayModel->setSearchLanguage(CardSearchLanguage{
-            cardsDisplay.getCardLang(), static_cast<SearchLanguageMode>(cardsDisplay.getCardSearchLanguage())});
-    };
-    applyCardSearchLanguage();
-    connect(&SettingsCache::instance().cardsDisplay(), &CardsDisplaySettings::cardLangChanged, this,
-            applyCardSearchLanguage);
-    connect(&SettingsCache::instance().cardsDisplay(), &CardsDisplaySettings::cardSearchLanguageChanged, this,
-            applyCardSearchLanguage);
-
    chooseTokenFromAllRadioButton = new QRadioButton(tr("Show &all tokens"));
    connect(chooseTokenFromAllRadioButton, &QRadioButton::toggled, this, &DlgCreateToken::actChooseTokenFromAll);
    chooseTokenFromDeckRadioButton = new QRadioButton(tr("Show tokens from this &deck"));
--- a/cockatrice/src/game_graphics/game_scene.cpp
+++ b/cockatrice/src/game_graphics/game_scene.cpp
@ -17,6 +17,7 @@
 #include <QDebug>
 #include <QGraphicsSceneMouseEvent>
 #include <QGraphicsView>
+#include <QSet>
 #include <QtMath>
 #include <libcockatrice/settings/interface_settings.h>
 #include <libcockatrice/utility/zone_names.h>
@ -44,19 +45,7 @@ GameScene::GameScene(PhasesToolbar *_phasesToolbar, QObject *parent)

 GameScene::~GameScene()
 {
-    // Sever all destroyed->removeAnimatedItem connections before the members below
-    // are destroyed: the base QGraphicsScene destructor destroys the remaining items,
-    // and their destroyed() signals must not reach slots that reference members that
-    // no longer exist. The connection handle overload is used because the string-based
-    // disconnect(nullptr, nullptr, this, nullptr) is invalid (the sender must never be
-    // nullptr) and would otherwise fail to sever these pointer-to-member connections.
-    for (auto it = animationItemConnections.constBegin(); it != animationItemConnections.constEnd(); ++it) {
-        QObject::disconnect(*it);
-    }
-    animationItemConnections.clear();
-
    delete animationTimer;
-    animationTimer = nullptr;

    // Delete all ArrowItems before QGraphicsScene's base destructor runs.
    // QGraphicsScene::~QGraphicsScene() destroys items in arbitrary order.
@ -221,12 +210,7 @@ void GameScene::removePlayer(PlayerLogic *player)

    clearArrowsForPlayer(player->getPlayerInfo()->getId());

-    // Closing a view removes it from zoneViews synchronously, so iterate over a
-    // copy: otherwise a player with several open views (e.g. library and hand)
-    // only has the first one closed here and the remaining views are left
-    // pointing at a player that is about to be deleted.
-    const QList<ZoneViewWidget *> zoneViewCopy = zoneViews;
-    for (ZoneViewWidget *zone : zoneViewCopy) {
+    for (ZoneViewWidget *zone : zoneViews) {
        if (zone->getPlayer() == player) {
            zone->close();
        }
@ -262,27 +246,17 @@ void GameScene::adjustPlayerRotation(int rotationAdjustment)
 */
 void GameScene::rearrange()
 {
-    if (rearranging) {
-        needsReArrange = true;
-        return;
-    }
-    rearranging = true;
-    do {
-        needsReArrange = false;
+    int firstPlayerIndex = 0;
+    auto playersPlaying = collectActivePlayers(firstPlayerIndex);
+    playersPlaying = rotatePlayers(playersPlaying, firstPlayerIndex);

-        int firstPlayerIndex = 0;
-        auto playersPlaying = collectActivePlayers(firstPlayerIndex);
-        playersPlaying = rotatePlayers(playersPlaying, firstPlayerIndex);
+    int columns = determineColumnCount(playersPlaying.size());
+    QSizeF sceneSize = computeSceneSizeAndPlayerLayout(playersPlaying, columns);

-        int columns = determineColumnCount(playersPlaying.size());
-        QSizeF sceneSize = computeSceneSizeAndPlayerLayout(playersPlaying, columns);
+    phasesToolbar->setHeight(sceneSize.height());
+    setSceneRect(0, 0, sceneSize.width(), sceneSize.height());

-        phasesToolbar->setHeight(sceneSize.height());
-        setSceneRect(0, 0, sceneSize.width(), sceneSize.height());
-
-        processViewSizeChange(viewSize);
-    } while (needsReArrange);
-    rearranging = false;
+    processViewSizeChange(viewSize);
 }

 // ---------- View Size ----------
@ -479,14 +453,8 @@ void GameScene::resizeColumnsAndPlayers(const QList<qreal> &minWidthByColumn, qr
    qreal extraWidthPerColumn = (newWidth - minWidth) / playersByColumn.size();
    qreal newx = phasesToolbar->getWidth();

-    // Snapshot the columns: resizing a player's table can synchronously trigger
-    // GameScene::rearrange (table width -> sizeChanged -> updateBoundingRect ->
-    // sizeChanged -> rearrange), and rearrange rebuilds playersByColumn. Iterating
-    // the live container across that re-entrant call would use invalidated iterators.
-    const QList<QList<PlayerGraphicsItem *>> columns = playersByColumn;
-
-    for (int col = 0; col < columns.size(); ++col) {
-        for (PlayerGraphicsItem *player : columns[col]) {
+    for (int col = 0; col < playersByColumn.size(); ++col) {
+        for (PlayerGraphicsItem *player : playersByColumn[col]) {
            player->processSceneSizeChange(minWidthByColumn[col] + extraWidthPerColumn);
            player->setPos(newx, player->y());
        }
@ -528,7 +496,6 @@ void GameScene::addArrow(QSharedPointer<ArrowData> data)

    auto *arrow = new ArrowItem(data, startCard, targetItem);
    addItem(arrow);
-    arrow->startDrawAnimation();
    arrowRegistry.insert(data, arrow);
    connect(arrow, &ArrowItem::requestDeletion, this, &GameScene::requestArrowDeletion);
 }
@ -669,10 +636,7 @@ CardItem *GameScene::findTopmostCardInZone(const QList<QGraphicsItem *> &items,
 */
 void GameScene::toggleZoneView(PlayerLogic *player, const QString &zoneName, int numberCards, bool isReversed)
 {
-    // Closing a view removes it from zoneViews synchronously, so iterate over a
-    // copy to make sure every already-open matching view is closed.
-    const QList<ZoneViewWidget *> zoneViewCopy = zoneViews;
-    for (auto *view : zoneViewCopy) {
+    for (auto &view : zoneViews) {
        ZoneViewZone *temp = view->getZone();
        if (temp->getLogic()->getName() == zoneName && temp->getLogic()->getPlayer() == player &&
            qobject_cast<ZoneViewZoneLogic *>(temp->getLogic())->getNumberCards() == numberCards) {
@ -772,53 +736,30 @@ bool GameScene::event(QEvent *event)

 void GameScene::timerEvent(QTimerEvent * /*event*/)
 {
-    QMutableHashIterator<QObject *, IAnimatedItem *> i(animatedItems);
+    QMutableSetIterator<CardItem *> i(cardsToAnimate);
    while (i.hasNext()) {
        i.next();
        if (!i.value()->animationEvent()) {
            i.remove();
        }
    }
-    if (animatedItems.isEmpty()) {
+    if (cardsToAnimate.isEmpty()) {
        animationTimer->stop();
    }
 }

-void GameScene::registerAnimationItem(IAnimatedItem *item)
+void GameScene::registerAnimationItem(AbstractCardItem *card)
 {
-    auto *object = dynamic_cast<QObject *>(item);
-    if (!object) {
-        return;
-    }
-    // Guard against duplicate connections using the connection map, not
-    // animatedItems: the animation timer removes entries from animatedItems when an
-    // animation completes, but the destroyed->removeAnimatedItem connection must
-    // persist until the object is destroyed. Relying on animatedItems here would let
-    // a re-registered item (e.g. a life counter that flashes repeatedly) accumulate
-    // duplicate destroyed connections, the older ones of which would survive teardown.
-    if (!animationItemConnections.contains(object)) {
-        animationItemConnections.insert(object,
-                                        connect(object, &QObject::destroyed, this, &GameScene::removeAnimatedItem));
-    }
-    animatedItems.insert(object, item);
-    if (animationTimer && !animationTimer->isActive()) {
+    cardsToAnimate.insert(static_cast<CardItem *>(card));
+    if (!animationTimer->isActive()) {
        animationTimer->start(10, this);
    }
 }

-void GameScene::unregisterAnimationItem(IAnimatedItem *item)
+void GameScene::unregisterAnimationItem(AbstractCardItem *card)
 {
-    animatedItems.remove(dynamic_cast<QObject *>(item));
-    if (animationTimer && animatedItems.isEmpty()) {
-        animationTimer->stop();
-    }
-}
-
-void GameScene::removeAnimatedItem(QObject *item)
-{
-    animatedItems.remove(item);
-    animationItemConnections.remove(item);
-    if (animationTimer && animatedItems.isEmpty()) {
+    cardsToAnimate.remove(static_cast<CardItem *>(card));
+    if (cardsToAnimate.isEmpty()) {
        animationTimer->stop();
    }
 }
--- a/cockatrice/src/game_graphics/game_scene.h
+++ b/cockatrice/src/game_graphics/game_scene.h
@ -4,14 +4,13 @@
 #include "../game/arrow_registry.h"
 #include "../game/board/arrow_data.h"
 #include "../game/zones/card_zone_logic.h"
-#include "animated_item.h"
 #include "board/arrow_item.h"

 #include <QGraphicsScene>
-#include <QHash>
 #include <QList>
 #include <QLoggingCategory>
 #include <QPointer>
+#include <QSet>

 inline Q_LOGGING_CATEGORY(GameSceneLog, "game_scene");
 inline Q_LOGGING_CATEGORY(GameScenePlayerAdditionRemovalLog, "game_scene.player_addition_removal");
@ -25,7 +24,6 @@ class CardItem;
 class ServerInfo_Card;
 class PhasesToolbar;
 class QBasicTimer;
-class QObject;

 /**
 * @class GameScene
@ -52,13 +50,9 @@ private:
    QList<ZoneViewWidget *> zoneViews;                  ///< Active zone view widgets
    QSize viewSize;                                     ///< Current view size
    QPointer<CardItem> hoveredCard;                     ///< Currently hovered card
-    QBasicTimer *animationTimer;                        ///< Timer for scene animations
-    QHash<QObject *, IAnimatedItem *> animatedItems;    ///< Items currently animating
-    QHash<QObject *, QMetaObject::Connection>
-        animationItemConnections; ///< destroyed->removeAnimatedItem handles per animated item
-    int playerRotation;           ///< Rotation offset for player layout
-    bool rearranging = false;     ///< Guard against re-entrant rearrange
-    bool needsReArrange = false;  ///< Pending rearrange requested during a pass
+    QBasicTimer *animationTimer;                        ///< Timer for card animations
+    QSet<CardItem *> cardsToAnimate;                    ///< Cards currently animating
+    int playerRotation;                                 ///< Rotation offset for player layout

    /**
     * @brief Updates which card is currently hovered based on scene coordinates.
@ -188,24 +182,15 @@ public:
    /** @brief Updates hovered card highlighting. */
    void updateHoveredCard(CardItem *newCard);

-    /**
-     * @brief Registers an item for animation updates with the shared scene timer.
-     *
-     * The item must inherit QObject; it is unregistered automatically when it is
-     * destroyed, so it may be deleted mid-animation without a dangling pointer.
-     */
-    void registerAnimationItem(IAnimatedItem *item);
+    /** @brief Registers a card for animation updates. */
+    void registerAnimationItem(AbstractCardItem *card);

-    /** @brief Unregisters an item from animation updates. */
-    void unregisterAnimationItem(IAnimatedItem *item);
+    /** @brief Unregisters a card from animation updates. */
+    void unregisterAnimationItem(AbstractCardItem *card);
    void startRubberBand(const QPointF &selectionOrigin);
    void resizeRubberBand(const QPointF &cursorPoint, int selectedCount);
    void stopRubberBand();

-private slots:
-    /** @brief Removes a destroyed item from the animation set. */
-    void removeAnimatedItem(QObject *item);
-
 public slots:
    void onCardSelectionChanged(AbstractCardItem *card, bool selected);
    void onCardRightClicked(AbstractCardItem *card, QPoint screenPos);
--- a/cockatrice/src/game_graphics/game_view.cpp
+++ b/cockatrice/src/game_graphics/game_view.cpp
@ -114,7 +114,6 @@ void GameView::startRubberBand(const QPointF &_selectionOrigin)
    }

    selectionOrigin = _selectionOrigin;
-    previousBandRect = QRect();
    rubberBand->setGeometry(QRect(mapFromScene(selectionOrigin), QSize(0, 0)));
    rubberBand->show();
 }
@ -129,17 +128,7 @@ void GameView::resizeRubberBand(const QPointF &cursorPoint, int selectedCount)

    QPoint cursor = cursorPoint.toPoint();
    QRect rect = QRect(mapFromScene(selectionOrigin), cursor).normalized();
-
    rubberBand->setGeometry(rect);
-    if (viewport()) {
-        // Repaint the union of the previous and current band rects: the vacated
-        // strip of a child widget is not reliably invalidated on all platforms
-        // (notably macOS), leaving stale pixels under the selection.
-        QRect dirty = previousBandRect.isNull() ? rect : previousBandRect.united(rect);
-        dirty.adjust(-1, -1, 1, 1);
-        viewport()->update(dirty);
-        previousBandRect = rect;
-    }

    if (!SettingsCache::instance().userInterface().getShowDragSelectionCount()) {
        dragCountLabel->hide();
@ -182,13 +171,7 @@ void GameView::stopRubberBand()
        return;
    }

-    // Same rationale as resizeRubberBand: repaint the last known band area
-    // since hiding a child widget doesn't reliably invalidate its region.
    rubberBand->hide();
-    if (viewport() && !previousBandRect.isNull()) {
-        viewport()->update(previousBandRect.adjusted(-1, -1, 1, 1));
-        previousBandRect = QRect();
-    }
    dragCountLabel->hide();
 }

--- a/cockatrice/src/game_graphics/game_view.h
+++ b/cockatrice/src/game_graphics/game_view.h
@ -27,7 +27,6 @@ private:
    QWidget *tallyContainer;
    QGridLayout *tallyLayout;
    QPointF selectionOrigin;
-    QRect previousBandRect;          ///< Last rubber-band rect for targeted repaint
    QList<TallyRow> cachedTallyRows; ///< Cached entries to avoid redundant rebuilds

    QSize rebuildTallyLabels(const QList<TallyRow> &entries);
--- a/cockatrice/src/game_graphics/hand_counter.cpp
+++ b/cockatrice/src/game_graphics/hand_counter.cpp
@ -1,6 +1,5 @@
 #include "hand_counter.h"

-#include "../interface/pixel_map_generator.h"
 #include "zones/card_zone.h"

 #include <QGraphicsSceneMouseEvent>
@ -33,8 +32,7 @@ void HandCounter::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*op
    QSize translatedSize = painter->combinedTransform().mapRect(boundingRect()).size().toSize();
    QPixmap cachedPixmap;
    if (!QPixmapCache::find("handCounter" + QString::number(translatedSize.width()), &cachedPixmap)) {
-        cachedPixmap =
-            themePixmap(QStringLiteral("hand")).scaled(translatedSize, Qt::KeepAspectRatio, Qt::SmoothTransformation);
+        cachedPixmap = QPixmap("theme:hand").scaled(translatedSize, Qt::KeepAspectRatio, Qt::SmoothTransformation);
        QPixmapCache::insert("handCounter" + QString::number(translatedSize.width()), cachedPixmap);
    }
    resetPainterTransform(painter);
--- a/cockatrice/src/game_graphics/player/menu/tally_menu.cpp
+++ b/cockatrice/src/game_graphics/player/menu/tally_menu.cpp
@ -12,13 +12,11 @@ TallyMenu::TallyMenu()
    aTallyNone = createTallyAction(TallyType::None);
    aTallySubtypes = createTallyAction(TallyType::Subtypes);
    aTallyTotalPower = createTallyAction(TallyType::TotalPower);
-    aTallyTotalToughness = createTallyAction(TallyType::TotalToughness);

    addAction(aTallyNone);
    addSeparator();
    addAction(aTallySubtypes);
    addAction(aTallyTotalPower);
-    addAction(aTallyTotalToughness);

    retranslateUi();
 }
@ -56,5 +54,4 @@ void TallyMenu::retranslateUi()
    aTallyNone->setText(tr("None"));
    aTallySubtypes->setText(tr("Subtypes"));
    aTallyTotalPower->setText(tr("Total Power"));
-    aTallyTotalToughness->setText(tr("Total Toughness"));
 }
--- a/cockatrice/src/game_graphics/player/menu/tally_menu.h
+++ b/cockatrice/src/game_graphics/player/menu/tally_menu.h
@ -24,7 +24,6 @@ private:
    QAction *aTallyNone = nullptr;
    QAction *aTallySubtypes = nullptr;
    QAction *aTallyTotalPower = nullptr;
-    QAction *aTallyTotalToughness = nullptr;

    QAction *createTallyAction(TallyType tallyType);
 };
--- a/cockatrice/src/game_graphics/player/player_graphics_item.cpp
+++ b/cockatrice/src/game_graphics/player/player_graphics_item.cpp
@ -1,10 +1,6 @@
 #include "player_graphics_item.h"

 #include "../../game/player/player_actions.h"
-#include "../../interface/card_picture_loader/card_picture_loader.h"
-#include "../../interface/widgets/cards/art_crop_attribution.h"
-#include "../../interface/widgets/cards/card_art_utils.h"
-#include "../../interface/widgets/playmat/playmat_utils.h"
 #include "../../interface/widgets/tabs/tab_game.h"
 #include "../board/abstract_card_item.h"
 #include "../board/counter_general.h"
@ -17,9 +13,6 @@
 #include "player_dialogs.h"

 #include <QGraphicsView>
-#include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/deck_list/deck_list.h>
-#include <libcockatrice/deck_list/playmat_resolver.h>
 #include <libcockatrice/settings/interface_settings.h>

 PlayerGraphicsItem::PlayerGraphicsItem(PlayerLogic *_player) : player(_player)
@ -35,10 +28,6 @@ PlayerGraphicsItem::PlayerGraphicsItem(PlayerLogic *_player) : player(_player)

    connect(player, &PlayerLogic::counterAdded, this, &PlayerGraphicsItem::onCounterAdded);
    connect(player, &PlayerLogic::counterRemoved, this, &PlayerGraphicsItem::onCounterRemoved);
-    connect(player, &PlayerLogic::deckChanged, this, &PlayerGraphicsItem::updatePlaymat);
-    connect(player, &PlayerLogic::playmatChanged, this, &PlayerGraphicsItem::updatePlaymat);
-    connect(&SettingsCache::instance().userInterface(), &InterfaceSettings::playmatVisibilityChanged, this,
-            [this](int) { updatePlaymat(); });

    playerMenu = new PlayerMenu(this);

@ -78,9 +67,6 @@ PlayerGraphicsItem::PlayerGraphicsItem(PlayerLogic *_player) : player(_player)

    connect(tableZoneGraphicsItem, &TableZone::sizeChanged, this, &PlayerGraphicsItem::updateBoundingRect);

-    connect(this, &PlayerGraphicsItem::playmatChanged, tableZoneGraphicsItem, &TableZone::onPlaymatChanged);
-    connect(this, &PlayerGraphicsItem::playmatChanged, stackZoneGraphicsItem, &StackZone::onPlaymatChanged);
-
    updateBoundingRect();

    rearrangeZones();
@ -126,6 +112,7 @@ void PlayerGraphicsItem::initializeZones()
    rfgZoneGraphicsItem->setPos(base + QPointF(0, 2 * h + h2 + 10));

    tableZoneGraphicsItem = new TableZone(player->getTableZone(), mirrored, this);
+    connect(tableZoneGraphicsItem, &TableZone::sizeChanged, this, &PlayerGraphicsItem::updateBoundingRect);
    connect(this, &PlayerGraphicsItem::mirroredChanged, tableZoneGraphicsItem, &TableZone::setMirrored);

    stackZoneGraphicsItem =
@ -168,61 +155,10 @@ qreal PlayerGraphicsItem::getMinimumWidth() const
    return result;
 }

-void PlayerGraphicsItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *)
+void PlayerGraphicsItem::paint(QPainter * /*painter*/,
+                               const QStyleOptionGraphicsItem * /*option*/,
+                               QWidget * /*widget*/)
 {
-    if (!hasPlaymat || playmatPixmap.isNull()) {
-        return;
-    }
-
-    // Calculate the combined bounding rect of stack + table zones
-    QPointF stackPos = stackZoneGraphicsItem->pos();
-    QPointF tablePos = tableZoneGraphicsItem->pos();
-    QSizeF stackSize = stackZoneGraphicsItem->boundingRect().size();
-    QSizeF tableSize = tableZoneGraphicsItem->boundingRect().size();
-
-    // Combined area: from stack left edge to table right edge
-    double combinedLeft = qMin(stackPos.x(), tablePos.x());
-    double combinedTop = qMin(stackPos.y(), tablePos.y());
-    double combinedRight = qMax(stackPos.x() + stackSize.width(), tablePos.x() + tableSize.width());
-    double combinedBottom = qMax(stackPos.y() + stackSize.height(), tablePos.y() + tableSize.height());
-
-    QRectF combinedArea(combinedLeft, combinedTop, combinedRight - combinedLeft, combinedBottom - combinedTop);
-
-    const QRectF srcRect = PlaymatUtils::computeArtSourceRect(playmatPixmap.size(), playmatParams);
-    const QRectF dstRect = PlaymatUtils::coverFitRect(combinedArea, srcRect.size());
-
-    painter->save();
-    painter->setClipRect(combinedArea);
-    painter->setRenderHint(QPainter::SmoothPixmapTransform, true);
-
-    // Render from a down-scaled copy of the art so the full-resolution source
-    // pixmap is never re-sampled at a tiny device size (also much cheaper than
-    // scaling it on every frame).
-    const QPixmap scaledPixmap = scaledPlaymatFor(srcRect, painter->worldTransform().mapRect(dstRect).size());
-    painter->drawPixmap(dstRect, scaledPixmap, QRectF(scaledPixmap.rect()));
-
-    painter->restore();
-
-    if (!playmatAttribution.isEmpty()) {
-        paintArtAttribution(*painter, combinedArea, playmatAttribution, Qt::AlignRight | Qt::AlignBottom, 0.8);
-    }
-}
-
-QPixmap PlayerGraphicsItem::scaledPlaymatFor(const QRectF &srcRect, const QSizeF &deviceDstSize)
-{
-    // Bucket the render size so the source pixmap is re-scaled at most once per
-    // zoom step instead of once per frame.
-    constexpr int bucketSize = 32;
-    const QSize target = QSize(qMax(1, qRound(deviceDstSize.width() / bucketSize) * bucketSize),
-                               qMax(1, qRound(deviceDstSize.height() / bucketSize) * bucketSize))
-                             .boundedTo(srcRect.toAlignedRect().size());
-
-    if (scaledPlaymatKey != target) {
-        const QPixmap crop = playmatPixmap.copy(srcRect.toAlignedRect());
-        scaledPlaymatPixmap = crop.scaled(target, Qt::KeepAspectRatio, Qt::SmoothTransformation);
-        scaledPlaymatKey = target;
-    }
-    return scaledPlaymatPixmap;
 }

 void PlayerGraphicsItem::processSceneSizeChange(int newPlayerWidth)
@ -252,11 +188,6 @@ void PlayerGraphicsItem::onCounterAdded(CounterState *state)
    AbstractCounter *widget;
    if (state->getName() == "life") {
        widget = playerTarget->addCounter(state);
-        connect(state, &CounterState::valueChanged, this, [this](int oldValue, int newValue, bool skipDamageAnimation) {
-            if (newValue < oldValue && !skipDamageAnimation) {
-                tableZoneGraphicsItem->triggerDamageShimmer();
-            }
-        });
    } else {
        widget = new GeneralCounter(state, player, true, this);
    }
@ -367,100 +298,3 @@ void PlayerGraphicsItem::updateBoundingRect()

    emit sizeChanged();
 }
-
-void PlayerGraphicsItem::updatePlaymat()
-{
-    int visibility = SettingsCache::instance().userInterface().getPlaymatVisibility();
-
-    // "Don't use playmats" — never show
-    if (visibility == PlaymatVisibilityNone) {
-        clearPlaymat();
-        return;
-    }
-
-    // "Show own playmat only" — hide playmats for remote players
-    if (visibility == PlaymatVisibilityOwnOnly && !player->getPlayerInfo()->getLocal()) {
-        clearPlaymat();
-        return;
-    }
-
-    CardRef playmatCard;
-    PlaymatParams params;
-
-    if (player->getHasRemotePlaymat()) {
-        // Prefer the server-confirmed playmat (updated by Command_SetPlaymat).
-        playmatCard = player->getRemotePlaymatCard();
-        params = player->getRemotePlaymatParams();
-    } else if (player->getPlayerInfo()->getLocal()) {
-        // Local player without a server broadcast yet: apply the full
-        // settings-based resolution chain (mode, fallback list, behavior).
-        const auto &settings = SettingsCache::instance().userInterface();
-        const PlaymatInfo resolved = resolvePlaymatForDeck(
-            player->getDeck(), settings.getPlaymatFallbackList(), static_cast<PlaymatMode>(settings.getPlaymatMode()),
-            static_cast<PlaymatFallbackMode>(settings.getPlaymatFallbackBehavior()), 0);
-        playmatCard = resolved.card;
-        params = resolved.params;
-    } else {
-        // Opponent without a server broadcast: use the deck-embedded playmat.
-        const DeckList &deck = player->getDeck();
-        const PlaymatInfo &deckPlaymat = deck.getPlaymat();
-        if (!deckPlaymat.card.isEmpty()) {
-            playmatCard = deckPlaymat.card;
-            params = deckPlaymat.params;
-        }
-    }
-
-    if (playmatCard.isEmpty()) {
-        clearPlaymat();
-        return;
-    }
-
-    playmatParams = params;
-    scaledPlaymatKey = QSize(); // the art crop depends on the params, drop any cached scale
-
-    ExactCard card = CardDatabaseManager::query()->getCard(playmatCard);
-    if (!card) {
-        clearPlaymat();
-        return;
-    }
-
-    playmatAttribution = buildArtAttribution(card);
-
-    QPixmap fullRes;
-    CardPictureLoader::getPixmap(fullRes, card, QSize(745, 1040));
-
-    if (fullRes.isNull()) {
-        disconnect(playmatPixmapConnection);
-        CardInfo *cardInfo = card.getCardPtr().data();
-        if (cardInfo) {
-            playmatPixmapConnection =
-                connect(cardInfo, &CardInfo::pixmapUpdated, this, &PlayerGraphicsItem::onPlaymatPixmapReady);
-        }
-        return;
-    }
-
-    if (!hasPlaymat) {
-        hasPlaymat = true;
-        emit playmatChanged(true);
-    }
-    playmatPixmap = CardArtUtils::rotateSidewaysLayoutArt(fullRes, card);
-    update();
-}
-
-void PlayerGraphicsItem::clearPlaymat()
-{
-    disconnect(playmatPixmapConnection);
-    playmatAttribution.clear();
-    if (hasPlaymat) {
-        hasPlaymat = false;
-        playmatPixmap = QPixmap();
-        scaledPlaymatKey = QSize();
-        emit playmatChanged(false);
-        update();
-    }
-}
-
-void PlayerGraphicsItem::onPlaymatPixmapReady()
-{
-    updatePlaymat();
-}
--- a/cockatrice/src/game_graphics/player/player_graphics_item.h
+++ b/cockatrice/src/game_graphics/player/player_graphics_item.h
@ -11,7 +11,6 @@
 #include "../game_scene.h"

 #include <QGraphicsObject>
-#include <libcockatrice/deck_list/deck_list.h>

 class HandZone;
 class PileZone;
@ -127,7 +126,6 @@ signals:
    void playerCountChanged();
    void mirroredChanged(bool isMirrored);
    void cardInfoRequested(const CardRef &cardRef);
-    void playmatChanged(bool hasPlaymat);

 private:
    PlayerLogic *player;
@ -148,23 +146,9 @@ private:
    bool mirrored;
    bool handVisible = false;

-    QPixmap playmatPixmap;
-    QPixmap scaledPlaymatPixmap; // down-scaled copy of playmatPixmap for the current render size
-    QSize scaledPlaymatKey;      // size bucket scaledPlaymatPixmap was rendered for
-    PlaymatParams playmatParams;
-    QString playmatAttribution;
-    bool hasPlaymat = false;
-    QMetaObject::Connection playmatPixmapConnection;
-
 private slots:
    void updateBoundingRect();
    void rearrangeZones();
-    void clearPlaymat();
-    void updatePlaymat();
-    void onPlaymatPixmapReady();
-
-private:
-    QPixmap scaledPlaymatFor(const QRectF &srcRect, const QSizeF &deviceDstSize);
 };

 #endif // COCKATRICE_PLAYER_GRAPHICS_ITEM_H
--- a/cockatrice/src/game_graphics/player/player_list_widget.cpp
+++ b/cockatrice/src/game_graphics/player/player_list_widget.cpp
@ -53,13 +53,13 @@ PlayerListWidget::PlayerListWidget(TabSupervisor *_tabSupervisor,
                                   QWidget *parent)
    : QTreeWidget(parent), tabSupervisor(_tabSupervisor), client(_client), game(_game), gameStarted(false)
 {
-    readyIcon = themePixmap(QStringLiteral("icons/ready_start"));
-    notReadyIcon = themePixmap(QStringLiteral("icons/not_ready_start"));
-    concededIcon = themePixmap(QStringLiteral("icons/conceded"));
+    readyIcon = QPixmap("theme:icons/ready_start");
+    notReadyIcon = QPixmap("theme:icons/not_ready_start");
+    concededIcon = QPixmap("theme:icons/conceded");
    playerIcon = loadColorAdjustedPixmap("theme:icons/player");
    judgeIcon = loadColorAdjustedPixmap("theme:icons/scales");
    spectatorIcon = loadColorAdjustedPixmap("theme:icons/spectator");
-    lockIcon = themePixmap(QStringLiteral("icons/lock"));
+    lockIcon = QPixmap("theme:icons/lock");

    if (tabSupervisor) {
        itemDelegate = new PlayerListItemDelegate(this);
@ -92,11 +92,6 @@ void PlayerListWidget::retranslateUi()

 void PlayerListWidget::addPlayer(const ServerInfo_PlayerProperties &player)
 {
-    if (players.contains(player.player_id())) {
-        updatePlayerProperties(player);
-        return;
-    }
-
    QTreeWidgetItem *newPlayer = new PlayerListTWI;
    players.insert(player.player_id(), newPlayer);
    updatePlayerProperties(player);
@ -181,17 +176,6 @@ void PlayerListWidget::removePlayer(int playerId)
    delete takeTopLevelItem(indexOfTopLevelItem(player));
 }

-void PlayerListWidget::clearSpectators()
-{
-    const QList<int> playerIds = players.keys();
-    for (int playerId : playerIds) {
-        QTreeWidgetItem *player = players.value(playerId, 0);
-        if (player && !player->data(1, Qt::UserRole).toBool()) {
-            removePlayer(playerId);
-        }
-    }
-}
-
 void PlayerListWidget::setActivePlayer(int playerId)
 {
    QMapIterator<int, QTreeWidgetItem *> i(players);
--- a/cockatrice/src/game_graphics/player/player_list_widget.h
+++ b/cockatrice/src/game_graphics/player/player_list_widget.h
@ -66,7 +66,6 @@ public slots:
    void addPlayer(const ServerInfo_PlayerProperties &player);
    void removePlayer(int playerId);
    void updatePlayerProperties(const ServerInfo_PlayerProperties &prop, int playerId = -1);
-    void clearSpectators();
 };

 #endif
--- a/cockatrice/src/game_graphics/player/player_target.cpp
+++ b/cockatrice/src/game_graphics/player/player_target.cpp
@ -1,11 +1,8 @@
 #include "player_target.h"

-#include "../../client/settings/cache_settings.h"
 #include "../../game/player/player_logic.h"
 #include "../../interface/pixel_map_generator.h"
-#include "../game_scene.h"

-#include <QApplication>
 #include <QDebug>
 #include <QPainter>
 #include <QPixmapCache>
@ -24,24 +21,17 @@ QRectF PlayerCounter::boundingRect() const

 void PlayerCounter::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*option*/, QWidget * /*widget*/)
 {
-    const int radius = 15;
-    const qreal border = 1.5;
-    // The box is drawn with a border-wide stroke straddling the path, so the
-    // visible outline spans [inset, inset + border]. Fills that must not cover
-    // the outline (e.g. the life-change flash) use a path inset by `border`.
-    const auto makePath = [](qreal inset) {
-        QPainterPath path(QPointF(50 - inset, inset));
-        path.lineTo(radius, inset);
-        path.arcTo(inset, inset, 2 * radius, 2 * radius, 90, 90);
-        path.lineTo(inset, 30 - inset);
-        path.lineTo(50 - inset, 30 - inset);
-        path.closeSubpath();
-        return path;
-    };
-    QPainterPath path = makePath(border / 2);
+    const int radius = 8;
+    const qreal border = 1;
+    QPainterPath path(QPointF(50 - border / 2, border / 2));
+    path.lineTo(radius, border / 2);
+    path.arcTo(border / 2, border / 2, 2 * radius, 2 * radius, 90, 90);
+    path.lineTo(border / 2, 30 - border / 2);
+    path.lineTo(50 - border / 2, 30 - border / 2);
+    path.closeSubpath();

    QPen pen(QColor(100, 100, 100));
-    pen.setWidthF(border);
+    pen.setWidth(border);
    painter->setPen(pen);
    painter->setBrush(hovered ? QColor(50, 50, 50, 160) : QColor(0, 0, 0, 160));

@ -55,53 +45,6 @@ void PlayerCounter::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*
    painter->setFont(font);
    painter->setPen(Qt::white);
    painter->drawText(translatedRect, Qt::AlignCenter, QString::number(value));
-
-    // Life-change flash: emerald on gain, red on loss, decaying over a few ticks.
-    if (flashAlpha > 0) {
-        painter->save();
-        QColor flashColor = flashDelta > 0 ? QColor(52, 224, 122) : QColor(239, 68, 68);
-        flashColor.setAlphaF(0.45 * flashAlpha);
-        painter->setPen(Qt::NoPen);
-        painter->setBrush(flashColor);
-        painter->setOpacity(0.85);
-        painter->drawPath(makePath(border));
-        painter->restore();
-    }
-}
-
-void PlayerCounter::onValueChanged(int oldValue, int newValue, bool skipDamageAnimation)
-{
-    flashDelta = newValue - oldValue;
-    if (flashDelta == 0) {
-        return;
-    }
-
-    if (!SettingsCache::instance().userInterface().getLifeCounterAnimationsEnabled()) {
-        flashAlpha = 0.0;
-        return;
-    }
-
-    if (skipDamageAnimation) {
-        flashAlpha = 0.0;
-        return;
-    }
-
-    flashAlpha = 1.0;
-    flashClock.start();
-    if (scene()) {
-        static_cast<GameScene *>(scene())->registerAnimationItem(this);
-    }
-}
-
-bool PlayerCounter::animationEvent()
-{
-    flashAlpha = 1.0 - flashClock.elapsed() / flashDurationMs;
-    if (flashAlpha <= 0.0) {
-        flashAlpha = 0.0;
-        return false;
-    }
-    update();
-    return true;
 }

 PlayerTarget::PlayerTarget(PlayerLogic *_owner, QGraphicsItem *parentItem)
@ -137,18 +80,8 @@ void PlayerTarget::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*o
    QRectF translatedRect = painter->combinedTransform().mapRect(avatarBoundingRect);
    QSize translatedSize = translatedRect.size().toSize();
    QPixmap cachedPixmap;
-    // The key must cover everything the generated pawn depends on: the rendered
-    // size, the user level, and the pixmap being drawn. fullPixmap.cacheKey() is
-    // 0 for every null pixmap, so the default-pawn branch additionally needs the
-    // pawn's privlevel (lowercased, matching UserLevelPixmapGenerator) and colors
-    // in the key — otherwise two players without a custom avatar (and the same
-    // user level) would share one cached pawn.
    const QString cacheKey = "avatar" + QString::number(translatedSize.width()) + "_" +
-                             QString::number(translatedSize.height()) + "_" + QString::number(info->user_level()) +
-                             "_" + QString::number(fullPixmap.cacheKey()) + "_" +
-                             QString::fromStdString(info->privlevel()).toLower() + "_" +
-                             QString::fromStdString(info->pawn_colors().left_side()) + "_" +
-                             QString::fromStdString(info->pawn_colors().right_side());
+                             QString::number(info->user_level()) + "_" + QString::number(fullPixmap.cacheKey());
    if (!QPixmapCache::find(cacheKey, &cachedPixmap)) {
        cachedPixmap = QPixmap(translatedSize.width(), translatedSize.height());

--- a/cockatrice/src/game_graphics/player/player_target.h
+++ b/cockatrice/src/game_graphics/player/player_target.h
@ -7,34 +7,21 @@
 #ifndef PLAYERTARGET_H
 #define PLAYERTARGET_H

-#include "../animated_item.h"
 #include "../board/abstract_counter.h"
 #include "../board/arrow_target.h"
 #include "../board/graphics_item_type.h"

-#include <QElapsedTimer>
 #include <QPixmap>

 class PlayerLogic;

-class PlayerCounter : public AbstractCounter, public IAnimatedItem
+class PlayerCounter : public AbstractCounter
 {
    Q_OBJECT
-protected:
-    void onValueChanged(int oldValue, int newValue, bool skipDamageAnimation) override;
-
-private:
-    static constexpr qreal flashDurationMs = 450.0;
-
-    QElapsedTimer flashClock;
-    qreal flashAlpha = 0.0;
-    int flashDelta = 0;
-
 public:
    PlayerCounter(CounterState *state, PlayerLogic *player, QGraphicsItem *parent);
    QRectF boundingRect() const override;
    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
-    bool animationEvent() override;
 };

 class PlayerTarget : public ArrowTarget
--- a/cockatrice/src/game_graphics/tally/stats_tally.cpp
+++ b/cockatrice/src/game_graphics/tally/stats_tally.cpp
@ -34,31 +34,3 @@ QList<TallyRow> StatsTally::computeTotalPower(const QList<CardItem *> &cards)
    QString name = QCoreApplication::translate("StatsTally", "Total Power");
    return {TallyRow{name, QString::number(total)}};
 }
-
-static int sumToughness(const QList<CardItem *> &cards)
-{
-    int total = 0;
-    for (auto card : cards) {
-        QVariantList parsed = CardItem::parsePT(card->getPT());
-        if (parsed.size() == 2) {
-            int toughness = parsed.at(1).toInt(); // toInt will default to 0 if it's not an int
-            total += qMax(toughness, 0);
-        }
-    }
-    return total;
-}
-
-QList<TallyRow> StatsTally::computeTotalToughness(const QList<CardItem *> &cards)
-{
-    // don't bother if none of the cards have pt
-    bool hasPT =
-        std::any_of(cards.cbegin(), cards.cend(), [](const CardItem *card) { return !card->getPT().isEmpty(); });
-    if (!hasPT) {
-        return {};
-    }
-
-    int total = sumToughness(cards);
-
-    QString name = QCoreApplication::translate("StatsTally", "Total Toughness");
-    return {TallyRow{name, QString::number(total)}};
-}
--- a/cockatrice/src/game_graphics/tally/stats_tally.h
+++ b/cockatrice/src/game_graphics/tally/stats_tally.h
@ -16,14 +16,6 @@ namespace StatsTally
 */
 QList<TallyRow> computeTotalPower(const QList<CardItem *> &cards);

-/**
- * @brief Sums the toughness of all selected cards
- *
- * @param cards The list of selected card items to analyze.
- * @return A single row containing the total, or an empty list if none of the cards have pt
- */
-QList<TallyRow> computeTotalToughness(const QList<CardItem *> &cards);
-
 } // namespace StatsTally

 #endif // COCKATRICE_STATS_TALLY_H
--- a/cockatrice/src/game_graphics/tally/tally.cpp
+++ b/cockatrice/src/game_graphics/tally/tally.cpp
@ -21,8 +21,6 @@ QList<TallyRow> Tally::compute(const QList<CardItem *> &cards, const TallyType t
            return SubtypeTally::countSubtypes(cards);
        case TallyType::TotalPower:
            return StatsTally::computeTotalPower(cards);
-        case TallyType::TotalToughness:
-            return StatsTally::computeTotalToughness(cards);
    }
    return {};
 }
--- a/cockatrice/src/game_graphics/tally/tally.h
+++ b/cockatrice/src/game_graphics/tally/tally.h
@ -21,8 +21,7 @@ enum class TallyType
    None,
    Subtypes,
    TotalPower,
-    TotalToughness,
-    MaxValue = TotalToughness // sentinel value
+    MaxValue = TotalPower // sentinel value
 };

 namespace Tally
--- a/cockatrice/src/game_graphics/zones/hand_zone.cpp
+++ b/cockatrice/src/game_graphics/zones/hand_zone.cpp
@ -41,8 +41,7 @@ void HandZone::handleDropEvent(const QList<CardDragItem *> &dragItems,
            }
        }
    } else {
-        bool sameZone = startZone == getLogic();
-        x = calcDropIndexFromY(dropPoint.y(), !sameZone);
+        x = calcDropIndexFromY(dropPoint.y());
    }

    Command_MoveCard cmd;
--- a/cockatrice/src/game_graphics/zones/select_zone.cpp
+++ b/cockatrice/src/game_graphics/zones/select_zone.cpp
@ -83,7 +83,7 @@ SelectZone::StackLayoutParams SelectZone::buildStackParams(qreal minOffset) cons
    return {cardCount, boundingRect().height(), cardHeight, offset, minOffset};
 }

-int SelectZone::calcDropIndexFromY(qreal dropY, bool allowCountExpand, qreal minOffset) const
+int SelectZone::calcDropIndexFromY(qreal dropY, qreal minOffset) const
 {
    const auto &cards = getLogic()->getCards();
    if (cards.isEmpty()) {
@ -94,8 +94,7 @@ int SelectZone::calcDropIndexFromY(qreal dropY, bool allowCountExpand, qreal min
    if (effectiveOffset <= 0.0) {
        return 0;
    }
-    int max = allowCountExpand ? params.cardCount : params.cardCount - 1;
-    return qBound(0, qRound((dropY - start) / effectiveOffset), max);
+    return qBound(0, qRound((dropY - start) / effectiveOffset), params.cardCount - 1);
 }

 void SelectZone::restoreStaleEscapedCards()
--- a/cockatrice/src/game_graphics/zones/select_zone.h
+++ b/cockatrice/src/game_graphics/zones/select_zone.h
@ -104,12 +104,8 @@ protected:
    /**
     * @brief Computes the card index at a given y-coordinate within the zone's vertical layout.
     * Returns 0 if the zone has no cards or the offset is zero.
-     *
-     * @param dropY The y-coordinate that the card was dropped at
-     * @param allowCountExpand If false, clamps the index at the number of cards minus 1
-     * @param minOffset Minimum offset to preserve
     */
-    int calcDropIndexFromY(qreal dropY, bool allowCountExpand, qreal minOffset = 0.0) const;
+    int calcDropIndexFromY(qreal dropY, qreal minOffset = 0.0) const;

    /**
     * @brief Positions cards vertically with alternating left/right x-offsets.
--- a/cockatrice/src/game_graphics/zones/stack_zone.cpp
+++ b/cockatrice/src/game_graphics/zones/stack_zone.cpp
@ -31,22 +31,8 @@ QRectF StackZone::boundingRect() const

 void StackZone::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*option*/, QWidget * /*widget*/)
 {
-    if (playmatActive) {
-        // Subtle overlay to distinguish stack zone from table zone (slightly darker)
-        painter->fillRect(boundingRect(), QColor(0, 0, 0, 80));
-    } else {
-        QBrush brush = themeManager->getExtraBgBrush(ThemeManager::Stack, getLogic()->getPlayer()->getZoneId());
-        painter->fillRect(boundingRect(), brush);
-    }
-}
-
-void StackZone::onPlaymatChanged(bool active)
-{
-    playmatActive = active;
-    // See TableZone::onPlaymatChanged for the rationale. Translucent overlay
-    // over a dynamic playmat should not be held in the device cache.
-    setCacheMode(active ? QGraphicsItem::NoCache : QGraphicsItem::DeviceCoordinateCache);
-    update();
+    QBrush brush = themeManager->getExtraBgBrush(ThemeManager::Stack, getLogic()->getPlayer()->getZoneId());
+    painter->fillRect(boundingRect(), brush);
 }

 void StackZone::handleDropEvent(const QList<CardDragItem *> &dragItems,
@ -57,14 +43,18 @@ void StackZone::handleDropEvent(const QList<CardDragItem *> &dragItems,
        return;
    }

-    bool sameZone = startZone == getLogic();
-    int index = calcDropIndexFromY(dropPoint.y(), !sameZone, MIN_CARD_VISIBLE);
-    if (sameZone) {
+    const auto &cards = getLogic()->getCards();
+    int index;
+    if (startZone == getLogic()) {
+        // Reordering within the zone: use drop position
+        index = calcDropIndexFromY(dropPoint.y(), MIN_CARD_VISIBLE);
        // Same-zone no-op: don't move a card onto itself
-        const auto &cards = getLogic()->getCards();
        if (!cards.isEmpty() && cards.at(index)->getId() == dragItems.at(0)->getId()) {
            return;
        }
+    } else {
+        // Coming from another zone: append at end (top of stack, rendered on top)
+        index = static_cast<int>(cards.size());
    }

    Command_MoveCard cmd;
--- a/cockatrice/src/game_graphics/zones/stack_zone.h
+++ b/cockatrice/src/game_graphics/zones/stack_zone.h
@ -15,13 +15,9 @@ class StackZone : public SelectZone
    Q_OBJECT
 private:
    qreal zoneHeight;
-    bool playmatActive = false;
 private slots:
    void updateBg();

-public slots:
-    void onPlaymatChanged(bool active);
-
 public:
    StackZone(StackZoneLogic *_logic, int _zoneHeight, QGraphicsItem *parent);
    /** @brief Resizes the stack zone height, e.g. when sharing vertical space with the command zone. */
--- a/cockatrice/src/game_graphics/zones/table_zone.cpp
+++ b/cockatrice/src/game_graphics/zones/table_zone.cpp
@ -8,7 +8,6 @@
 #include "../board/arrow_item.h"
 #include "../board/card_drag_item.h"
 #include "../board/card_item.h"
-#include "../game_scene.h"
 #include "../z_values.h"

 #include <QGraphicsScene>
@ -48,31 +47,6 @@ void TableZone::updateBg()
    update();
 }

-void TableZone::triggerDamageShimmer()
-{
-    if (!SettingsCache::instance().userInterface().getBattlefieldFlashEnabled()) {
-        damageShimmerAlpha = 0.0;
-        return;
-    }
-
-    damageShimmerAlpha = 1.0;
-    shimmerClock.start();
-    if (scene()) {
-        static_cast<GameScene *>(scene())->registerAnimationItem(this);
-    }
-}
-
-bool TableZone::animationEvent()
-{
-    damageShimmerAlpha = 1.0 - shimmerClock.elapsed() / shimmerDurationMs;
-    if (damageShimmerAlpha <= 0.0) {
-        damageShimmerAlpha = 0.0;
-        return false;
-    }
-    update();
-    return true;
-}
-
 QRectF TableZone::boundingRect() const
 {
    return QRectF(0, 0, width, height);
@ -92,43 +66,20 @@ bool TableZone::isInverted() const

 void TableZone::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*option*/, QWidget * /*widget*/)
 {
-    if (playmatActive) {
-        // Subtle overlay to distinguish table zone from stack zone
-        painter->fillRect(boundingRect(), QColor(0, 0, 0, 60));
-    } else {
-        QBrush brush = themeManager->getExtraBgBrush(ThemeManager::Table, getLogic()->getPlayer()->getZoneId());
-        painter->fillRect(boundingRect(), brush);
-    }
+    QBrush brush = themeManager->getExtraBgBrush(ThemeManager::Table, getLogic()->getPlayer()->getZoneId());
+    painter->fillRect(boundingRect(), brush);

    if (active) {
        paintZoneOutline(painter);
    } else {
        // inactive player gets a darker table zone with a semi transparent black mask
-        // this means if the user provides a custom background or playmat it will fade
+        // this means if the user provides a custom background it will fade
        painter->fillRect(boundingRect(), FADE_MASK);
    }

-    // Decaying crimson wash from taking damage.
-    if (damageShimmerAlpha > 0.0) {
-        QColor shimmerColor(239, 68, 68);
-        shimmerColor.setAlphaF(0.22 * damageShimmerAlpha);
-        painter->fillRect(boundingRect(), shimmerColor);
-    }
-
    paintLandDivider(painter);
 }

-void TableZone::onPlaymatChanged(bool active)
-{
-    playmatActive = active;
-    // While a playmat is shown the zone paints a translucent overlay over the
-    // dynamic playmat behind it. Keep it out of the device cache so the cached
-    // pixels are never stale relative to the playmat (and to avoid compositing
-    // artifacts of cached translucent content on some platforms).
-    setCacheMode(active ? QGraphicsItem::NoCache : QGraphicsItem::DeviceCoordinateCache);
-    update();
-}
-
 /**
   Render a soft outline around the edge of the TableZone.

--- a/cockatrice/src/game_graphics/zones/table_zone.h
+++ b/cockatrice/src/game_graphics/zones/table_zone.h
@ -8,19 +8,16 @@
 #define TABLEZONE_H

 #include "../../game/zones/table_zone_logic.h"
-#include "../animated_item.h"
 #include "../board/abstract_card_item.h"
 #include "select_zone.h"

-#include <QElapsedTimer>
-
 /**
 * @brief TableZone is the grid based rect where CardItems may be placed.
 *
 * It is the main play zone and can be customized with background images.
 */
 //! \todo Refactor methods to make more readable, extract logic to private methods (especially reorganizeCards()).
-class TableZone : public SelectZone, public IAnimatedItem
+class TableZone : public SelectZone
 {
    Q_OBJECT

@ -86,7 +83,6 @@ private:
     */
    bool active = false;
    bool mirrored = false;
-    bool playmatActive = false;

    [[nodiscard]] bool isInverted() const;

@ -96,9 +92,6 @@ private slots:
     */
    void updateBg();

-public slots:
-    void onPlaymatChanged(bool active);
-
 public slots:
    /**
       Reorganizes CardItems in the TableZone
@ -128,16 +121,6 @@ public:
     */
    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;

-    /**
-       Flashes the table surface after a player loses life.
-
-       Wired up through the life counter so the battlefield glows when life drops.
-     */
-    void triggerDamageShimmer();
-
-    /** @brief Decays the damage shimmer by one timer tick. */
-    bool animationEvent() override;
-
    /**
       Toggles the selected items as tapped.
     */
@ -188,17 +171,8 @@ public:
    }
    void setWidth(qreal _width)
    {
-        // The width is stored as an int; truncate to match the previous implicit conversion.
-        const int newWidth = static_cast<int>(_width);
-        if (width == newWidth) {
-            return;
-        }
        prepareGeometryChange();
-        width = newWidth;
-        // The parent player item's boundingRect (which clips the playmat painting) is
-        // derived from this zone's size. Without this signal the playmat is cut off at
-        // the stale boundingRect edge whenever the scene is resized wider.
-        emit sizeChanged();
+        width = _width;
    }
    [[nodiscard]] qreal getWidth() const
    {
@ -211,11 +185,6 @@ public:
    }

 private:
-    static constexpr qreal shimmerDurationMs = 450.0;
-
-    QElapsedTimer shimmerClock;
-    qreal damageShimmerAlpha = 0.0;
-
    void paintZoneOutline(QPainter *painter);
    void paintLandDivider(QPainter *painter);

--- a/cockatrice/src/game_graphics/zones/view_zone.cpp
+++ b/cockatrice/src/game_graphics/zones/view_zone.cpp
@ -1,6 +1,5 @@
 #include "view_zone.h"

-#include "../../client/settings/cache_settings.h"
 #include "../../game/player/player_actions.h"
 #include "../../game/player/player_logic.h"
 #include "../../game/zones/view_zone_logic.h"
@ -12,13 +11,11 @@
 #include <QGraphicsSceneWheelEvent>
 #include <QPainter>
 #include <QtMath>
-#include <libcockatrice/card/card_localization.h>
 #include <libcockatrice/protocol/pb/command_dump_zone.pb.h>
 #include <libcockatrice/protocol/pb/command_move_card.pb.h>
 #include <libcockatrice/protocol/pb/response_dump_zone.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_card.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
-#include <libcockatrice/settings/cards_display_settings.h>

 /**
 * @param parent the parent QGraphicsWidget containing the reveal zone
@ -256,10 +253,7 @@ ZoneViewZone::GridSize ZoneViewZone::positionCardsForDisplay(CardList &cards, Ca

 void ZoneViewZone::setFilterString(const QString &_filterString)
 {
-    const CardsDisplaySettings &cardsDisplay = SettingsCache::instance().cardsDisplay();
-    filterString = FilterString(
-        _filterString, CardSearchLanguage{cardsDisplay.getCardLang(),
-                                          static_cast<SearchLanguageMode>(cardsDisplay.getCardSearchLanguage())});
+    filterString = FilterString(_filterString);
    reorganizeCards();
 }

--- a/Show more
+++ b/Show more