diff --git a/.ci/Ubuntu26.04/Dockerfile b/.ci/Ubuntu26.04/Dockerfile
index cc6528858..a7e010ff5 100644
--- a/.ci/Ubuntu26.04/Dockerfile
+++ b/.ci/Ubuntu26.04/Dockerfile
@@ -8,7 +8,6 @@ RUN apt-get update && \
         cmake \
         file \
         g++ \
-        gcovr \
         git \
         libgl-dev \
         liblzma-dev \
diff --git a/.ci/compile.sh b/.ci/compile.sh
index a9386400f..39df165a5 100755
--- a/.ci/compile.sh
+++ b/.ci/compile.sh
@@ -8,9 +8,6 @@
 # --suffix <suffix> renames package with this suffix, requires arg
 # --server compiles servatrice
 # --test runs tests
-# --sanitize builds with AddressSanitizer and UndefinedBehaviorSanitizer, gcc/clang only
-# --coverage instruments the test run for line coverage and prints a gcovr summary, gcc only
-
 # --debug or --release sets the build type ie CMAKE_BUILD_TYPE
 # --ccache [<size>] uses ccache and shows stats, optionally provide size
 # --evict-ccache <age> runs ccache eviction based on given age after build
@@ -19,8 +16,8 @@
 # --cmake-generator <generator> sets CMAKE_GENERATOR as used by cmake
 # --target-macos-version <version> sets the min os version - only used for macOS builds
 # --profile writes an MSBuild performance summary and binary log, Windows only
-# uses env: BUILDTYPE MAKE_INSTALL MAKE_PACKAGE PACKAGE_TYPE PACKAGE_SUFFIX MAKE_SERVER MAKE_NO_CLIENT MAKE_TEST USE_CCACHE CCACHE_SIZE CCACHE_EVICTION_AGE BUILD_DIR CMAKE_GENERATOR TARGET_MACOS_VERSION MAKE_SANITIZE MAKE_COVERAGE VCPKG_TARGET_MACOS_VERSION BUILD_PARALLEL_LEVEL BUILD_PROFILE USE_SCCACHE
-# (correspond to args: --debug/--release --install --package <package type> --suffix <suffix> --server --test --sanitize --coverage --ccache <ccache_size> --dir <dir> --profile --sccache)
+# uses env: BUILDTYPE MAKE_INSTALL MAKE_PACKAGE PACKAGE_TYPE PACKAGE_SUFFIX MAKE_SERVER MAKE_NO_CLIENT MAKE_TEST USE_CCACHE CCACHE_SIZE CCACHE_EVICTION_AGE BUILD_DIR CMAKE_GENERATOR TARGET_MACOS_VERSION VCPKG_TARGET_MACOS_VERSION BUILD_PARALLEL_LEVEL BUILD_PROFILE USE_SCCACHE
+# (correspond to args: --debug/--release --install --package <package type> --suffix <suffix> --server --test --ccache <ccache_size> --dir <dir> --profile --sccache)
 # exitcode: 1 for failure, 3 for invalid arguments
 
 # Read arguments
@@ -62,14 +59,6 @@ while [[ $# != 0 ]]; do
       MAKE_TEST=1
       shift
       ;;
-    '--sanitize')
-      MAKE_SANITIZE=1
-      shift
-      ;;
-    '--coverage')
-      MAKE_COVERAGE=1
-      shift
-      ;;
     '--debug')
       BUILDTYPE="Debug"
       shift
@@ -158,15 +147,6 @@ if [[ ! $BUILD_DIR ]]; then
   BUILD_DIR="build"
 fi
 mkdir -p "$BUILD_DIR"
-
-if [[ $MAKE_COVERAGE ]]; then
-  # Resolved while the working directory is still the source root. $0 is relative to the
-  # directory the script was invoked from, so after the cd below it no longer resolves, and
-  # under `set -e` the failed subshell would abort the build rather than just yielding an empty
-  # variable. Only the coverage report needs this, so only coverage pays for it.
-  SRC_ROOT="$(cd "$(dirname "$0")/.." && pwd)"
-fi
-
 cd "$BUILD_DIR"
 
 # Set minimum CMake Version
@@ -193,17 +173,6 @@ fi
 if [[ $MAKE_TEST ]]; then
   flags+=("-DTEST=1")
 fi
-if [[ $MAKE_SANITIZE ]]; then
-  flags+=("-DENABLE_SANITIZERS=ON")
-else
-  # The release-package step re-runs cmake in the same build dir, so an
-  # ENABLE_SANITIZERS=ON left over from the debug step would otherwise leak
-  # into the shipped binaries (libasan/libubsan Depends in the DEB).
-  flags+=("-DENABLE_SANITIZERS=OFF")
-fi
-if [[ $MAKE_COVERAGE ]]; then
-  flags+=("-DENABLE_COVERAGE=ON")
-fi
 if [[ $USE_CCACHE ]]; then
   flags+=("-DUSE_CCACHE=1")
   # PCH-aware caching is required or ccache refuses to cache any TU that
@@ -426,50 +395,7 @@ fi
 
 if [[ $MAKE_TEST ]]; then
   echo "::group::Run tests"
-  if [[ $MAKE_SANITIZE ]]; then
-    # detect_leaks=0: Qt and the sanitizers' own runtimes both leak at exit by design, and
-    # LeakSanitizer's default is aggressive enough to bury our real findings under hundreds
-    # of process-teardown reports. Malloc/free misuse and use-after-free are what ASan is for
-    # and they stay fully on.
-    # abort_on_error=1: a bad access leaves the process in an unusable state, so continuing
-    # only produces a second, more confusing report from the wreckage.
-    # UBSAN halt_on_error=1: without it UBSan prints "runtime error: ..." but the
-    # process exits 0 (recover mode), so gtest/ctest report a pass and the job
-    # stays green. Combined with -fno-sanitize-recover=undefined at compile time,
-    # the first finding aborts the test process with a non-zero exit.
-    export ASAN_OPTIONS="detect_leaks=0:abort_on_error=1:print_stacktrace=1:symbolize=1"
-    export UBSAN_OPTIONS="print_stacktrace=1:halt_on_error=1:symbolize=1"
-  fi
-  # Every TEST() is its own CTest entry, so the suite is process-spawn bound rather than CPU
-  # bound and -j recovers nearly all of the per-process overhead. The test binaries are safe to
-  # run concurrently: the only one that claims a fixed resource is single_instance_manager_test,
-  # which already scopes its local socket name to its own pid so parallel copies cannot collide.
-  ctest -C "$BUILDTYPE" --output-on-failure -j "${CTEST_JOBS:-4}"
-  echo "::endgroup::"
-fi
-
-if [[ $MAKE_COVERAGE ]]; then
-  # gcovr is not a build dependency and is not available everywhere, so a missing one is reported
-  # and skipped rather than failing an otherwise green build.
-  echo "::group::Coverage report"
-  GCOVR="$(command -v gcovr || true)"
-  if [[ -z $GCOVR ]]; then
-    echo "gcovr not found; install it to produce a coverage report"
-  else
-    "$GCOVR" --version
-    # This script configures with `cmake ..`, so the build dir it was started from is the object
-    # directory and the source root is one level up. Both are passed explicitly: gcovr otherwise
-    # walks the current directory and trips over in-tree build directories left by other tooling,
-    # whose stale .gcno files cannot be resolved. --config is named too, so the filters apply no
-    # matter what directory gcovr happens to start from.
-    GCOVR_ARGS=("." --root "$SRC_ROOT" --object-directory "." --config "$SRC_ROOT/gcovr.cfg")
-    "$GCOVR" "${GCOVR_ARGS[@]}" --txt --decisions
-    "$GCOVR" "${GCOVR_ARGS[@]}" --html-details coverage-details.html --html-title "Cockatrice line coverage"
-    "$GCOVR" "${GCOVR_ARGS[@]}" --lcov -o coverage.lcov
-    "$GCOVR" "${GCOVR_ARGS[@]}" --cobertura-pretty -o coverage.xml
-    "$GCOVR" "${GCOVR_ARGS[@]}" --json-summary-pretty -o coverage-summary.json
-    echo "Coverage artifacts written to coverage-details.html, coverage.lcov, coverage.xml and coverage-summary.json"
-  fi
+  ctest -C "$BUILDTYPE" --output-on-failure
   echo "::endgroup::"
 fi
 
@@ -516,21 +442,15 @@ if [[ $MAKE_PACKAGE ]]; then
       fi
       echo "Installer content is clean"
 
-      # Fail the build if the installer does not carry the runtime the
-      # applications link against - a file that must be there, or a DLL that must
-      # not be. The runtime DLLs reach the package by globbing every *.dll out of
-      # the build output directories, so anything that build produced can ride
-      # along and nothing else in the build objects to it: a Qt module the client
-      # links statically (Qt6Multimedia.dll, Qt6QuickWidgets.dll) can be left out,
-      # and the test framework's gtest.dll can be shipped. Either only surfaces on
-      # a user's machine after an update has already replaced their install, as
-      # "The code execution cannot proceed because Qt6Multimedia.dll was not
-      # found" or "abseil_dll.dll is either not designed to run on Windows or it
-      # contains an error". required-runtime.txt is written by the top level
-      # CMakeLists.txt from the same module lists the targets are built against
-      # plus the vcpkg bin directory the app-local copies come from.
-      if [[ ! -f required-runtime.txt ]]; then
-        echo "::error file=$0::required-runtime.txt not found in the build dir, cannot verify the runtime"
+      # Fail the build if the installer is missing a Qt runtime the applications
+      # link against. The DLLs reach the package by globbing every *.dll out of
+      # the build output directories, so a module the client links statically
+      # (Qt6Multimedia.dll, Qt6QuickWidgets.dll) can be left out without anything
+      # else noticing, and the only symptom is a client that refuses to start
+      # after an update. required-qt-runtime.txt is written by the top level
+      # CMakeLists.txt from the same module list the targets are built against.
+      if [[ ! -f required-qt-runtime.txt ]]; then
+        echo "::error file=$0::required-qt-runtime.txt not found in the build dir, cannot verify the Qt runtime"
         exit 1
       fi
       # 7-Zip writes CRLF on Windows, so the \r has to come off before any
@@ -540,7 +460,7 @@ if [[ $MAKE_PACKAGE ]]; then
       # being a wildcard; -i because that is how the installed tree behaves -
       # the uninstaller clears both $INSTDIR\plugins and $INSTDIR\Plugins.
       # The archive side and the manifest side have to agree on line endings.
-      # CMake writes required-runtime.txt with the platform's line ending and
+      # CMake writes required-qt-runtime.txt with the platform's line ending and
       # 7-Zip writes CRLF on Windows, so a trailing \r survives on $entry and
       # defeats the whole-line match - every entry then reads as missing even
       # though the listing holds it verbatim.
@@ -549,7 +469,7 @@ if [[ $MAKE_PACKAGE ]]; then
       installer_paths="$("$seven_zip" l -slt "$package" | tr -d '\r' |
         sed -n 's/^Path = //p' |
         sed -e 's|\\|/|g' -e 's|^[$]INSTDIR/||' -e 's|^[$]OUTDIR/||' -e 's|^[$]PLUGINSDIR/||' -e 's|^\./||' -e 's|^/||')"
-      manifest="$(tr -d '\r' <required-runtime.txt)"
+      manifest="$(tr -d '\r' <required-qt-runtime.txt)"
       missing=""
       checked=0
       while IFS= read -r entry; do
@@ -562,11 +482,11 @@ if [[ $MAKE_PACKAGE ]]; then
         fi
       done <<<"$manifest"
       if [[ -n $missing ]]; then
-        echo "::error file=$0::Installer is missing required runtime files:$missing"
+        echo "::error file=$0::Installer is missing required Qt runtime files:$missing"
         # Print both sides of the comparison. A mismatch here has twice been
         # caused by the shape of 7-Zip's output rather than by a missing file,
         # and a bare "missing" line cannot tell those apart.
-        echo "required-runtime.txt asked for $checked path(s); 7-Zip listed $(grep -c '' <<<"$installer_paths") path(s)"
+        echo "required-qt-runtime.txt asked for $checked path(s); 7-Zip listed $(grep -c '' <<<"$installer_paths") path(s)"
         # Indent with parameter expansion rather than sed 's/^/  /', which the
         # linter reports as SC2001.
         echo "--- required ---"
@@ -576,66 +496,7 @@ if [[ $MAKE_PACKAGE ]]; then
         echo "${listed_head//$'\n'/$'\n  '}"
         exit 1
       fi
-      echo "Installer carries the Qt runtime of every module the three applications link ($checked files)"
-
-      # Now the other direction: a top level DLL in the package that the manifest
-      # does not name. The missing check above cannot see a runtime that was
-      # never expected.
-      #
-      # Two things are reported here and neither may fail the build.
-      #
-      # The test framework is a fact rather than a guess - no shipped executable
-      # links gtest or gmock, and the build output directories the "*.dll" glob
-      # reads are shared with the test targets, so gtest.dll and gmock.dll are
-      # one filter away from shipping in every release. Even so it is reported
-      # instead of enforced: a check that has never passed on a real package has
-      # not earned the right to block a release, and the first Windows run of an
-      # enforcing version is exactly when its own wrong assumptions show up.
-      #
-      # Everything else is expected to be there. required-runtime.txt names the
-      # Qt modules the three applications link, and the protobuf, Abseil,
-      # OpenSSL, liblzma, ffmpeg and Qt debug DLLs in the package come in on the
-      # build output glob instead, because nothing in the build declares them by
-      # name. So this list is a report of what the package carries, not a verdict.
-      # Read it when a dependency is added; do not fail on it.
-      forbidden=""
-      unexpected=""
-      while IFS= read -r entry; do
-        [[ -z $entry ]] && continue
-        # Top level only. A DLL under Plugins/ or a nested image format plugin is
-        # a plugin the platform loads by name, not a runtime the executable
-        # imports, and requiring one here would list all of them every run.
-        [[ $entry == */* ]] && continue
-        if grep -qxiF "$entry" <<<"$manifest"; then
-          continue
-        fi
-        # NSIS extracts its plugins to $PLUGINSDIR, which the path normalization
-        # above strips, so they arrive here looking like payload files. They are
-        # part of the installer, not of the installed tree.
-        if [[ $entry == [Nn][Ss][Dd][Ii][Aa][Ll][Oo][Gg][Ss].dll ||
-          $entry == [Nn][Ss][Ee][Xx][Ee][Cc].dll ||
-          $entry == [Ss][Yy][Ss][Tt][Ee][Mm].dll ||
-          $entry == [Uu][Ss][Ee][Rr][Ii][Nn][Ff][Oo].dll ||
-          $entry == [Ii][Nn][Ee][Tt].dll ]]; then
-          continue
-        fi
-        if [[ $entry == [Gg][Tt][Ee][Ss][Tt]* || $entry == [Gg][Mm][Oo][Cc][Kk]* ]]; then
-          forbidden+=" $entry"
-        else
-          unexpected+=" $entry"
-        fi
-      done < <(grep -i '\.dll$' <<<"$installer_paths")
-      if [[ -n $forbidden ]]; then
-        echo "::warning file=$0::Installer contains test framework DLLs that no shipped executable links:$forbidden"
-        echo "A build output directory shared with the test targets has leaked into the package."
-      fi
-      if [[ -n $unexpected ]]; then
-        echo "Top level DLLs in the package beyond the linked Qt modules:$unexpected"
-        echo "These arrive on the build output glob, not from required-runtime.txt, so they are reported and not required."
-      fi
-      if [[ -z $forbidden && -z $unexpected ]]; then
-        echo "Installer carries no runtime files beyond the linked Qt modules"
-      fi
+      echo "Installer contains the full Qt runtime ($checked files)"
     fi
     echo "::endgroup::"
   fi
diff --git a/.ci/docker.sh b/.ci/docker.sh
index 412ad6a1d..46112daaa 100644
--- a/.ci/docker.sh
+++ b/.ci/docker.sh
@@ -13,17 +13,11 @@
 # --set-cache <location> sets the location to cache the image or for ccache
 #
 # requires: docker
-# uses env: NAME IMAGE_SUFFIX CACHE BUILD GET SAVE INTERACTIVE
+# uses env: NAME CACHE BUILD GET SAVE INTERACTIVE
 # (correspond to args: <name> --set-cache <cache> --build --get --save --interactive)
 # sets env: RUN CCACHE_DIR IMAGE_NAME RUN_ARGS RUN_OPTS BUILD_SCRIPT
 # exitcode: 1 for failure, 2 for missing dockerfile, 3 for invalid arguments
 #
-# IMAGE_SUFFIX is optional and only appended to the image name, never to NAME, so that a matrix
-# leg can have its own image and image cache without needing its own directory under .ci. Two legs
-# building and tagging the same image concurrently would race on `docker build --tag`.
-# It is deliberately not called SUFFIX: compile.sh already uses SUFFIX for output file names, and
-# a job-level SUFFIX would be silently overridden by those per-step env blocks.
-#
 # exported RUN function will run the BUILD_SCRIPT inside of the docker container.
 # note that the docker container will not inherit any environment variables!
 #
@@ -87,7 +81,7 @@ if ! [[ $NAME ]]; then
   return 3
 fi
 
-export IMAGE_NAME="${project_name,,}_${NAME,,}${IMAGE_SUFFIX:+_${IMAGE_SUFFIX,,}}" # lower case
+export IMAGE_NAME="${project_name,,}_${NAME,,}" # lower case
 
 docker_dir=".ci/$NAME"
 if ! [[ -r $docker_dir/Dockerfile ]]; then
diff --git a/.dockerignore b/.dockerignore
index 8e0b69332..2abeb2727 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,3 +1,4 @@
+.git/
 build/
 .github/
 .tx/
diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml
index b12b0eabd..5bc5e2cbc 100644
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -144,36 +144,17 @@ jobs:
 
             package: DEB
 
-            # The one leg that runs the suite under AddressSanitizer and
-            # UndefinedBehaviorSanitizer. Debian 13 and Fedora 44 keep covering the
-            # uninstrumented suite, so nothing is lost by instrumenting this one.
-            sanitize: yes
-
-          - distro: Ubuntu
-            version: 26.04
-            variant: cover    # separate image and ccache, same distro
-
-            # The one leg that runs instrumented for line coverage and publishes the report as
-            # a workflow artifact. It is a separate leg rather than a second flag on the
-            # sanitizer leg because the two instruments answer different questions: the
-            # sanitizer leg reports what the run did wrong, the coverage leg reports what the
-            # run never touched at all. Combining them would also slow both down. Packaging is
-            # skipped because the leg above already publishes the DEB for this distro.
-            coverage: yes
-            package: skip
-
-    name: ${{ matrix.distro }} ${{ matrix.version }}${{ matrix.variant && format(' {0}', matrix.variant) || '' }}
+    name: ${{ matrix.distro }} ${{ matrix.version }}
     needs: configure
     runs-on: ubuntu-latest    # https://github.com/actions/runner-images
     continue-on-error: ${{ matrix.allow-failure == 'yes' }}
     timeout-minutes: 70
     env:
-      CACHE: ${{ github.workspace }}/.cache/${{ matrix.distro }}${{ matrix.version }}${{ matrix.variant }}    # directory for caching docker image and ccache
+      CACHE: ${{ github.workspace }}/.cache/${{ matrix.distro }}${{ matrix.version }}    # directory for caching the compiler cache
       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
       CMAKE_GENERATOR: 'Ninja'
       NAME: ${{ matrix.distro }}${{ matrix.version }}
-      IMAGE_SUFFIX: ${{ matrix.variant }}
 
     steps:
       - name: "Checkout"
@@ -183,7 +164,7 @@ jobs:
         id: restore_ccache
         uses: actions/cache/restore@v6
         with:
-          key: ccache-${{ matrix.distro }}${{ matrix.version }}${{ matrix.variant }}
+          key: ccache-${{ matrix.distro }}${{ matrix.version }}
           path: ${{ env.CACHE }}/.ccache
 
       - name: "Build ${{ matrix.distro }} ${{ matrix.version }} Docker image"
@@ -193,9 +174,6 @@ jobs:
       - name: "Build debug and test"
         if: matrix.test != 'skip'
         shell: bash
-        env:
-          sanitize: '${{ matrix.sanitize }}'
-          coverage: '${{ matrix.coverage }}'
         run: |
           source .ci/docker.sh
           args=()
@@ -203,33 +181,7 @@ jobs:
           args+=(--ccache "$CCACHE_SIZE")
           args+=(--cmake-generator "$CMAKE_GENERATOR")
 
-          extra=()
-          [[ $sanitize == yes ]] && extra+=(--sanitize)
-          [[ $coverage == yes ]] && extra+=(--coverage)
-
-          RUN --server --debug --test "${extra[@]}" "${args[@]}"
-
-      # RUN bind-mounts the workspace into the container, so the report the build wrote into
-      # build/ is already on the host and no second container is needed to collect it.
-      - name: "Collect coverage report"
-        if: matrix.coverage == 'yes'
-        shell: bash
-        run: |
-          mkdir -p coverage
-          # --html-details writes one page per source file plus a stylesheet and script, and the
-          # index links to all of them by relative name. Copying the index alone would publish a
-          # report where every link 404s, so the whole family has to travel together.
-          cp build/coverage-details* coverage/
-          cp build/coverage.lcov build/coverage.xml build/coverage-summary.json coverage/
-          ls -la coverage/
-
-      - name: "Upload coverage artifact"
-        if: matrix.coverage == 'yes'
-        uses: actions/upload-artifact@v4
-        with:
-          name: coverage-report
-          path: coverage/
-          if-no-files-found: warn
+          RUN --server --debug --test "${args[@]}"
 
       - name: "Build release package"
         id: build
@@ -587,16 +539,15 @@ jobs:
           TARGET_MACOS_VERSION: '${{ matrix.override_target }}'
           USE_CCACHE: ${{ matrix.use_ccache }}
           USE_SCCACHE: ${{ matrix.use_sccache }}
-          # Only pushes to the default branch may write the shared binary cache: the
-          # archives a run compiles are only as trustworthy as the code they were
-          # built from, and only merged code may populate the scope that master and
-          # release builds restore and link. Pull requests (same-repository ones
-          # included) restore the shared cache but never write it; with the source
-          # left at read the collect step below finds nothing on PRs, so no
-          # pull-request-scoped entry is ever saved that no later run could restore.
-          # Forks pushing to their own default branch resolve github.ref against
-          # their own repository, so they keep a working cache of their own there.
-          VCPKG_BINARY_SOURCES: "clear;files,${{ steps.vcpkg-cache.outputs.path }},${{ case(github.ref == 'refs/heads/master', 'readwrite', 'read') }}"
+          # vcpkg has to be allowed to write into the cache directory even on a pull
+          # request, because that is where "Collect new vcpkg entries" looks for the
+          # archives this run had to compile itself. With the source left at read those
+          # archives are never written, the collect step finds nothing, and vcpkg-cache-import.yml
+          # gets no artifact to heal the shared cache with. The importer is what publishes
+          # to master's scope; a pull request's own merge ref stays unreadable by every
+          # later run, so the action's own save there costs quota but nothing else.
+          # Forks keep the read-only mode, they are the case that must not be trusted.
+          VCPKG_BINARY_SOURCES: "clear;files,${{ steps.vcpkg-cache.outputs.path }},${{ case(github.ref == 'refs/heads/master' || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository), 'readwrite', 'read') }}"
           VCPKG_DISABLE_METRICS: 1
           VCPKG_FEATURE_FLAGS: dependencygraph
           VCPKG_TARGET_MACOS_VERSION: ${{ matrix.vcpkg_deployment_target }}
@@ -613,18 +564,19 @@ jobs:
         shell: bash
         run: find . -name NSISOutput.log -exec cat {} +
 
-      # A master run hands over the archives it had to build itself so that
-      # vcpkg-cache-import.yml, which runs in the default branch scope, can save them
-      # where later runs can restore them. Pull requests hand over nothing: their cache
-      # entries would be scoped to refs/pull/<n>/merge and stay unreadable for every
-      # other run, so writing them only burns the repository's quota.
+      # A pull request cannot write the shared cache itself: its cache entries are scoped
+      # to refs/pull/<n>/merge and stay unreadable for every other run, so writing them
+      # from a pull request only burns the repository's quota. So hand over only the
+      # archives this leg had to build itself and let vcpkg-cache-import.yml, which runs
+      # in the default branch scope, save them where later runs can restore them.
+      # Forks are skipped, they are the one case where the archives must not be trusted.
       # vcpkg_upload keeps this to one leg per scope: macOS 14, 15 and 26 share a scope
       # by design, and all three rebuild the same archives, so uploading from each of them
       # would publish three identical 269 MB artifacts under one artifact name and make
       # the importer spawn a save job per copy.
       - name: "Collect new vcpkg entries"
         id: vcpkg_new
-        if: github.ref == 'refs/heads/master' && matrix.vcpkg_upload == 1
+        if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository && matrix.vcpkg_upload == 1
         shell: bash
         env:
           CACHE_DIR: '${{ steps.vcpkg-cache.outputs.path }}'
diff --git a/.github/workflows/docker-release.yml b/.github/workflows/docker-release.yml
index 937386940..967d94c58 100644
--- a/.github/workflows/docker-release.yml
+++ b/.github/workflows/docker-release.yml
@@ -20,22 +20,11 @@ on:
   release:
     types:
       - released    # publishing of stable releases
-  workflow_dispatch:    # (re)publish the image for an existing stable release
-    inputs:
-      tag:
-        description: 'Existing release tag to build and publish (e.g. 2026-10-03-Release-3.1.0)'
-        required: true
-        type: string
-      latest:
-        description: 'Also update the "latest" tag'
-        required: true
-        type: boolean
-        default: true
 
-# Cancel earlier, unfinished runs of this workflow on the same branch (unless publishing)
+# Cancel earlier, unfinished runs of this workflow on the same branch (unless on release)
 concurrency:
-  group: "${{ github.workflow }} @ ${{ inputs.tag || github.ref_name }}"
-  cancel-in-progress: ${{ github.event_name != 'release' && github.event_name != 'workflow_dispatch' }}
+  group: "${{ github.workflow }} @ ${{ github.ref_name }}"
+  cancel-in-progress: ${{ github.event_name != 'release' }}
 
 env:
   GHCR_IMAGE: ghcr.io/cockatrice/servatrice
@@ -68,14 +57,12 @@ jobs:
     steps:
       - name: "Checkout"
         uses: actions/checkout@v7
-        with:
-          ref: ${{ case(github.event_name == 'workflow_dispatch', format('refs/tags/{0}', inputs.tag), '') }}
 
       - name: "Set up Docker buildx"
         uses: docker/setup-buildx-action@v4
 
       - name: "Login to GitHub Container Registry (GHCR)"
-        if: (github.event_name == 'release' && github.event.release.prerelease == false) || github.event_name == 'workflow_dispatch'
+        if: github.event_name == 'release' && github.event.release.prerelease == false
         id: login
         uses: docker/login-action@v4
         with:
@@ -83,7 +70,7 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ github.token }}
 
-      # Don't push for non-publishing triggers
+      # Don't push for non-release triggers
       - name: "Build image"
         if: steps.login.outcome != 'success'
         uses: docker/build-push-action@v7
@@ -124,6 +111,7 @@ jobs:
         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/*
@@ -133,7 +121,7 @@ jobs:
   # 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) || github.event_name == 'workflow_dispatch')
+    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
 
@@ -159,11 +147,8 @@ jobs:
           images: ${{ env.GHCR_IMAGE }}
           flavor: |
             latest=auto
-          # if semver, also: type=semver,pattern={{version}} / {{major}}.{{minor}}
           tags: |
-            type=ref,event=tag
-            type=raw,value=${{ inputs.tag }},enable=${{ github.event_name == 'workflow_dispatch' }}
-            type=raw,value=latest,enable=${{ github.event_name == 'workflow_dispatch' && inputs.latest }}
+            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"
@@ -191,7 +176,7 @@ jobs:
 
       - name: "Inspect images"
         env:
-          GITHUB_TAG: ${{ inputs.tag || github.ref_name }}
+          GITHUB_TAG: ${{ github.ref_name }}
         run: |
           docker buildx imagetools inspect "$GHCR_IMAGE:latest"
           docker buildx imagetools inspect "$GHCR_IMAGE:$GITHUB_TAG"
diff --git a/.github/workflows/documentation-build.yml b/.github/workflows/documentation-build.yml
index 91ee14e3e..f13b964cd 100644
--- a/.github/workflows/documentation-build.yml
+++ b/.github/workflows/documentation-build.yml
@@ -28,13 +28,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: "Checkout"
+      - name: "Checkout code"
         uses: actions/checkout@v7
         with:
           submodules: recursive
 
       - name: "Install Graphviz"
-        shell: bash
         run: |
           sudo apt-get install -y graphviz
           dot -V
@@ -45,7 +44,6 @@ jobs:
           version: "1.18.0"
 
       - name: "Update Doxygen Configuration"
-        shell: bash
         run: |
           git diff Doxyfile
           doxygen -u Doxyfile
@@ -60,10 +58,9 @@ jobs:
 
       - name: "Generate Documentation"
         if: always()
-        shell: bash
         run: doxygen Doxyfile
 
-      - name: "Deploy to cockatrice.github.io/docs"
+      - name: "Deploy to cockatrice.github.io"
         if: github.event_name == 'release' || github.event_name == 'workflow_dispatch'
         uses: peaceiris/actions-gh-pages@v4
         with:
@@ -72,8 +69,3 @@ jobs:
           external_repository: Cockatrice/cockatrice.github.io
           publish_branch: master
           publish_dir: ./docs/html
-
-      - name: Link to Documentation Page
-        if: github.event_name == 'release' || github.event_name == 'workflow_dispatch'
-        shell: bash
-        run: echo "::notice title=New documentation published::Shortly available at https://cockatrice.github.io/docs/"
diff --git a/.github/workflows/translations-pull.yml b/.github/workflows/translations-pull.yml
index da3df1714..71b0b4c22 100644
--- a/.github/workflows/translations-pull.yml
+++ b/.github/workflows/translations-pull.yml
@@ -1,7 +1,7 @@
 name: Update Translations
 
 permissions:
-  contents: write
+  contents: read
   pull-requests: write
 
 on:
diff --git a/.github/workflows/translations-push.yml b/.github/workflows/translations-push.yml
index 17645cab2..41a7aef40 100644
--- a/.github/workflows/translations-push.yml
+++ b/.github/workflows/translations-push.yml
@@ -1,7 +1,7 @@
 name: Update Translation Source
 
 permissions:
-  contents: write
+  contents: read
   pull-requests: write
 
 on:
diff --git a/.github/workflows/vcpkg-cache-import.yml b/.github/workflows/vcpkg-cache-import.yml
index 3cc7b2203..01bfb7f7a 100644
--- a/.github/workflows/vcpkg-cache-import.yml
+++ b/.github/workflows/vcpkg-cache-import.yml
@@ -1,15 +1,11 @@
 name: Import vcpkg cache
 
-# After a runner image update changes every port's ABI hash, the first master run
-# rebuilds protobuf, openssl and abseil from source and saves them into the shared
-# cache, where every later run can restore them.
-#
-# Only master pushes are imported here: the collect step, keys.txt and the zip
-# contents all come from the workflow run being imported, so importing from an
-# unmerged pull request would let anyone who can push a branch — or a bot actor
-# such as Dependabot, whose PRs are same-repo — promote arbitrary binaries into
-# the scope that master and tag builds restore and link into signed releases.
-# Forks build untrusted code and must never reach that scope either.
+# A pull request run can only write caches into its own refs/pull/<n>/merge scope, which
+# nothing else is allowed to restore. So after a runner image update changes every port's
+# ABI hash, the first pull request rebuilds protobuf, openssl and abseil from source and
+# the next one does the same, until somebody merges and a master run finally repopulates
+# the shared cache. This workflow takes the archives such a run produced and saves them
+# in the default branch scope instead, where every later run can restore them.
 #
 # repository_dispatch is not used on purpose: it would also resolve to the default branch,
 # but it counts as a low-trust trigger and may only write there when it declares a
@@ -32,17 +28,12 @@ concurrency:
 jobs:
   list:
     name: List new vcpkg entries
-    # Only a successful push to the default branch has archives worth importing.
-    # Only code that landed on master may populate the scope master runs restore.
-    # Bot actors are excluded on top: their runs must never promote binaries into
-    # the shared scope even if they somehow target the default branch.
+    # Only a successful same-repository pull request has archives worth importing. Forks
+    # build untrusted code and must never reach a cache that master runs restore and link.
     if: >-
       github.event.workflow_run.conclusion == 'success' &&
-      github.event.workflow_run.event == 'push' &&
-      github.event.workflow_run.head_branch == 'master' &&
-      github.event.workflow_run.head_repository.full_name == github.repository &&
-      !endsWith(github.event.workflow_run.actor.login, '[bot]') &&
-      !endsWith(github.event.workflow_run.triggering_actor.login, '[bot]')
+      github.event.workflow_run.event == 'pull_request' &&
+      github.event.workflow_run.head_repository.full_name == github.repository
     runs-on: ubuntu-slim    # https://github.com/actions/runner-images/blob/main/images/ubuntu-slim/ubuntu-slim-Readme.md
     # workflow_run is a low-trust trigger, so cache access is read-only by default even
     # though this run resolves to the default branch. Assert below that this took effect,
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2ae7b94a5..1ebe84a62 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,10 +33,6 @@ option(WITH_ORACLE "Build Cockatrice card database tool (Oracle)" ON)
 option(WITH_SERVER "Build Cockatrice server (Servatrice)" OFF)
 # Compile tests
 option(TEST "Build tests" OFF)
-# Build with AddressSanitizer and UndefinedBehaviorSanitizer
-option(ENABLE_SANITIZERS "Build with AddressSanitizer and UndefinedBehaviorSanitizer" OFF)
-# Build instrumented for GCC line coverage, reported with gcovr
-option(ENABLE_COVERAGE "Build instrumented for GCC line coverage" OFF)
 # Use vcpkg regardless of OS
 option(USE_VCPKG "Use vcpkg regardless of OS" OFF)
 
@@ -101,11 +97,11 @@ endif()
 
 # A project name is needed for CPack
 # Version can be overriden by git tags, see cmake/getversion.cmake
-project("Cockatrice" VERSION 3.1.2)
+project("Cockatrice" VERSION 3.1.0)
 
 # Set release name if not provided via env/cmake var
 if(NOT DEFINED GIT_TAG_RELEASENAME)
-  set(GIT_TAG_RELEASENAME "Reality Check")
+  set(GIT_TAG_RELEASENAME "Graduation Day")
 endif()
 
 # Use c++20 for all targets
@@ -235,12 +231,6 @@ else()
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe")
 endif()
 
-# Always included, because they define cockatrice_disable_sanitizers_for() and
-# cockatrice_disable_coverage_for() for the vendored trees. They only touch the global flags
-# when ENABLE_SANITIZERS or ENABLE_COVERAGE is on.
-include(Sanitizers)
-include(Coverage)
-
 # GNU systems need to define the Mersenne exponent for the RNG to compile w/o warning
 if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
   add_definitions("-DSFMT_MEXP=19937")
@@ -356,54 +346,38 @@ elseif(WIN32)
   # Configure file with custom definitions for NSIS.
   configure_file("${COCKATRICE_CMAKE_PATH}/NSIS.definitions.nsh.in" "${PROJECT_BINARY_DIR}/NSIS.definitions.nsh")
 
-  # Every runtime DLL a Windows install has to contain, as paths relative to the
-  # install root. .ci/compile.sh reads this and fails the build when the packaged
-  # installer is missing one of them, or carries a runtime it does not know about.
+  # Every Qt module the client links against, as the DLL names a Windows install
+  # has to contain, plus the platform plugin without which the client cannot
+  # start. .ci/compile.sh reads this and fails the build when the packaged
+  # installer is missing one of them.
   #
-  # All three applications are packaged into the same directory on Windows, so
-  # this is the union of their Qt module lists, not just the client's: Servatrice
-  # contributes Qt6Sql.dll and Oracle contributes nothing the client lacks, and a
-  # client-only manifest leaves Qt6Sql.dll unasserted even though servatrice.exe
-  # is installed next to cockatrice.exe and cannot start without it.
+  # Only the client is packaged on Windows, so this is the client's module list
+  # rather than the union across server, client and Oracle: demanding Oracle's or
+  # Servatrice's modules of the client installer checks nothing about the client.
   #
   # A statically linked Qt module ships no runtime DLL, so requiring one would
   # fail the package check on a static build for no reason. cockatrice/CMakeLists.txt
   # installs the runtime of every module listed here, and skips static ones the
   # same way, so the two can never disagree.
   #
-  # Only the Qt modules, and that is deliberate. protobuf, Abseil, liblzma, zlib
-  # and OpenSSL also ride in on the "*.dll" glob, and a client whose runtime is
-  # absent, stale or of the wrong architecture fails to start with "abseil_dll.dll
-  # is either not designed to run on Windows or it contains an error", so they
-  # are exactly the files worth asserting.
-  #
-  # Their names cannot be derived from the vcpkg bin directory, which is what a
-  # first attempt did and what a Windows build immediately refuted: bin holds
-  # everything vcpkg installed, not everything the applications import. It also
-  # contains gmock.dll, libprotobuf-lite.dll, libprotoc.dll, legacy.dll and three
-  # pthreadVC*.dll FindThreads probes, none of which any shipped executable
-  # links, so requiring them failed a build over a package that was correct.
-  #
-  # Deriving them from the executables' own import tables is the real answer,
-  # and fixup_bundle already walks it to decide what to copy. Until that result
-  # is available to CMake, requiring the vcpkg half would mean guessing names
-  # again, which is what produced this bug report in the first place. So assert
-  # what is derived from the build's own link lists and leave the rest to the
-  # purge in cmake/NSIS.template.in, which removes every DLL regardless of name.
-  set(_required_runtime "")
-  foreach(_qt_module IN LISTS COCKATRICE_QT_MODULES SERVATRICE_QT_MODULES ORACLE_QT_MODULES)
+  # A DLL missing from the package only surfaces on a user's machine, after an
+  # update has already replaced their install, as "The code execution cannot
+  # proceed because Qt6Multimedia.dll was not found" or as a missing procedure
+  # entry point in a Qt6QuickWidgets.dll left over from the previous version.
+  # Assert it while the installer is still being built instead.
+  set(_required_qt_runtime "")
+  foreach(_qt_module IN LISTS COCKATRICE_QT_MODULES)
     get_target_property(_qt_module_type ${_qt_module} TYPE)
     if(_qt_module_type STREQUAL "SHARED_LIBRARY")
       string(REGEX REPLACE "^Qt6::" "" _qt_component "${_qt_module}")
-      list(APPEND _required_runtime "Qt6${_qt_component}.dll")
+      list(APPEND _required_qt_runtime "Qt6${_qt_component}.dll")
     endif()
   endforeach()
-  list(APPEND _required_runtime "Plugins/platforms/qwindows.dll")
-
-  list(REMOVE_DUPLICATES _required_runtime)
-  list(SORT _required_runtime)
-  string(REPLACE ";" "\n" _required_runtime "${_required_runtime}")
-  file(WRITE "${PROJECT_BINARY_DIR}/required-runtime.txt" "${_required_runtime}\n")
+  list(APPEND _required_qt_runtime "Plugins/platforms/qwindows.dll")
+  list(REMOVE_DUPLICATES _required_qt_runtime)
+  list(SORT _required_qt_runtime)
+  string(REPLACE ";" "\n" _required_qt_runtime "${_required_qt_runtime}")
+  file(WRITE "${PROJECT_BINARY_DIR}/required-qt-runtime.txt" "${_required_qt_runtime}\n")
 
   # include vcredist into the package; NSIS will take care of running it
   if(VCREDISTRUNTIME_FOUND)
diff --git a/Doxyfile b/Doxyfile
index c12ff4a8a..d6f0af2d2 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -1066,11 +1066,25 @@ INPUT_FILE_ENCODING    =
 # provided as Doxygen C comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
 # *.f18, *.f, *.for, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
 
-FILE_PATTERNS          = *.cpp \
+FILE_PATTERNS          = *.cc \
+                         *.cxx \
+                         *.cxxm \
+                         *.cpp \
                          *.cppm \
+                         *.ccm \
+                         *.c++ \
+                         *.c++m \
+                         *.ii \
+                         *.ixx \
                          *.ipp \
+                         *.i++ \
                          *.inl \
                          *.h \
+                         *.hh \
+                         *.hxx \
+                         *.hpp \
+                         *.h++ \
+                         *.markdown \
                          *.md \
                          *.dox \
                          *.proto
@@ -2653,7 +2667,7 @@ DOT_NUM_THREADS        = 0
 # Minimum value: 1, maximum value: 1000, default value: 50.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-DOT_BATCH_SIZE         = 50
+DOT_BATCH_SIZE         = 500
 
 # DOT_COMMON_ATTR is common attributes for nodes, edges and labels of
 # subgraphs. When you want a differently looking font in the dot files that
diff --git a/README.md b/README.md
index f2a170868..5935bb540 100644
--- a/README.md
+++ b/README.md
@@ -102,7 +102,6 @@ There are various places where useful information for different needs are mainta
 - [Official Wiki](https://github.com/Cockatrice/Cockatrice/wiki) `Community supported`
 - [Official Webpage](https://cockatrice.github.io/)
 - [Official README](https://github.com/Cockatrice/Cockatrice/blob/master/README.md) `This file`
-- [Official CONTRIBUTING](https://github.com/Cockatrice/Cockatrice/blob/master/.github/CONTRIBUTING.md)
 
 Cockatrice tries to use the [Google Developer Documentation Style Guide](https://developers.google.com/style/) to ensure consistent documentation. We encourage you to improve the documentation by suggesting edits based on this guide.
 
@@ -160,12 +159,6 @@ The following flags (with their non-default values) can be passed to `cmake`:
 | `-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                              |
 
-> [!TIP]
-> Build code documentation ([Doxygen](https://www.doxygen.nl)) according to our [configuration](https://github.com/Cockatrice/Cockatrice/blob/master/Doxyfile) into `/docs`:
-> ```bash
-> doxygen Doxyfile
-> ```
-
 
 # Run
 
diff --git a/cmake/Coverage.cmake b/cmake/Coverage.cmake
deleted file mode 100644
index 0345a2d36..000000000
--- a/cmake/Coverage.cmake
+++ /dev/null
@@ -1,75 +0,0 @@
-# Line-coverage instrumentation opt-in, plus per-source opt-out
-# Input: ENABLE_COVERAGE
-# Defines: cockatrice_disable_coverage_for
-#
-# Included once from the root CMakeLists.txt, immediately after the per-compiler flag
-# block, so add_compile_options() reaches every library and executable defined below.
-#
-# Note the name deliberately shadows CMake's own built-in Modules/Coverage.cmake. It resolves
-# to this file only because the root CMakeLists.txt puts cmake/ at the front of
-# CMAKE_MODULE_PATH; if that ever moves, include(Coverage) would silently pick up the built-in
-# module, which only defines a `COVERAGE` custom target and touches no global flags, so
-# instrumentation would quietly stop happening rather than erroring.
-
-include(CheckCXXSourceCompiles)
-
-# Opt a set of vendored sources out of instrumentation.
-#
-# cockatrice_disable_coverage_for(<source> ...)
-#
-# Third-party code drags the total down with lines no test can ever reach, and a total that
-# cannot move is not a useful signal. This is the same carve-out the sanitizer build uses.
-#
-# The sources must be named relative to the directory that compiles them. CMake resolves a
-# source-file property against the directory scope the target was declared in, so calling
-# this from the root with absolute paths silently does nothing. That is why the call sites
-# live next to the add_library/add_executable that pull the vendored code in.
-#
-# SKIP_PRECOMPILE_HEADERS mirrors the sanitizer helper. The precompiled header carries the
-# instrumentation flags, and mixing an instrumented PCH with an uninstrumented translation
-# unit makes GCC reject it.
-function(cockatrice_disable_coverage_for)
-  if(NOT ENABLE_COVERAGE)
-    return()
-  endif()
-  # There is no -fno-coverage: --coverage is shorthand for -fprofile-arcs -ftest-coverage, so both
-  # halves have to be negated. CC rejects "-fno-coverage" outright, which is how the vendored C
-  # files below hit it first.
-  set_source_files_properties(
-    ${ARGN} PROPERTIES COMPILE_OPTIONS "-fno-profile-arcs;-fno-test-coverage" SKIP_PRECOMPILE_HEADERS ON
-  )
-endfunction()
-
-if(ENABLE_COVERAGE)
-  # Line coverage needs the compiler's own toolchain, so only GCC is supported. Clang's
-  # equivalent is llvm-cov, which reads a different intermediate format and would need a
-  # separate report path; rejecting it is better than emitting .gcno files that gcovr cannot
-  # read.
-  if(NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-    message(FATAL_ERROR "ENABLE_COVERAGE requires GCC, but the compiler is ${CMAKE_CXX_COMPILER_ID}. "
-                        "Clang coverage needs llvm-cov and is not wired up."
-    )
-  endif()
-
-  # Probe the way the flag will actually be used: compile AND link. A .gcno file comes from the
-  # compile step, but the runtime that writes .gcda files comes from the link step, so probing
-  # only the compile step would pass on a toolchain that cannot actually produce coverage.
-  set(_cockatrice_saved_required_flags "${CMAKE_REQUIRED_FLAGS}")
-  set(_cockatrice_saved_required_link_options "${CMAKE_REQUIRED_LINK_OPTIONS}")
-  set(CMAKE_REQUIRED_FLAGS "-O0 -g")
-  set(CMAKE_REQUIRED_LINK_OPTIONS -fprofile-arcs -ftest-coverage)
-  check_cxx_source_compiles("int main() { return 0; }" COCKATRICE_HAVE_COVERAGE_FLAGS)
-  set(CMAKE_REQUIRED_FLAGS "${_cockatrice_saved_required_flags}")
-  set(CMAKE_REQUIRED_LINK_OPTIONS "${_cockatrice_saved_required_link_options}")
-
-  if(NOT COCKATRICE_HAVE_COVERAGE_FLAGS)
-    message(FATAL_ERROR "ENABLE_COVERAGE is on, but this toolchain rejected the coverage flags.")
-  endif()
-
-  # -O0 keeps the line mapping honest: at higher optimisation levels the compiler merges and
-  # relocates lines, and the report describes code that no longer exists in that form.
-  add_compile_options(--coverage -O0 -g)
-  add_link_options(--coverage)
-
-  message(STATUS "Coverage instrumentation enabled (--coverage). Report with gcovr over the build dir.")
-endif()
diff --git a/cmake/FindQtRuntime.cmake b/cmake/FindQtRuntime.cmake
index 2d74aca4d..971c9094d 100644
--- a/cmake/FindQtRuntime.cmake
+++ b/cmake/FindQtRuntime.cmake
@@ -7,12 +7,6 @@
 # Output: ORACLE_QT_MODULES
 # Output: TEST_QT_MODULES
 
-# Every Qt module an application links against, as the DLL names a Windows
-# install has to contain. Core is listed explicitly rather than left to arrive
-# transitively: it is the one module nothing can do without, and required-runtime.txt
-# is built from these lists, so a module missing here is a runtime the package
-# check never asserts. That is how Qt6Core.dll went unasserted while every other
-# Qt module was checked.
 set(REQUIRED_QT_COMPONENTS Core)
 if(WITH_SERVER)
   set(_SERVATRICE_NEEDED Network Sql WebSockets)
@@ -20,7 +14,6 @@ endif()
 if(WITH_CLIENT)
   set(_COCKATRICE_NEEDED
       Concurrent
-      Core
       Gui
       Multimedia
       Network
@@ -40,9 +33,7 @@ endif()
 if(TEST)
   # Union of Qt modules required across all test targets (independent of application targets).
   # When adding a new test that needs additional Qt modules, add them here rather than in the test's CMakeLists.txt.
-  # Test is QtTest: it brings QAbstractItemModelTester and QSignalSpy, which are how the Qt model
-  # and signal contracts get verified without standing up a GUI.
-  set(_TEST_NEEDED Concurrent Network Svg Widgets Test)
+  set(_TEST_NEEDED Concurrent Network Svg Widgets)
 endif()
 
 set(REQUIRED_QT_COMPONENTS ${REQUIRED_QT_COMPONENTS} ${_SERVATRICE_NEEDED} ${_COCKATRICE_NEEDED} ${_ORACLE_NEEDED}
diff --git a/cmake/NSIS.template.in b/cmake/NSIS.template.in
index b6125238f..597667e9d 100644
--- a/cmake/NSIS.template.in
+++ b/cmake/NSIS.template.in
@@ -21,13 +21,6 @@ Var IsUpgrade
 Var AbortReason
 Var WaitPid
 Var LauncherExited
-Var InstallLogPath
-Var LogHandle
-Var LogMessage
-Var LogFindHandle
-Var LogFindName
-Var LogMatchLabel
-Var LogMatchPattern
 
 !include LogicLib.nsh
 !include FileFunc.nsh
@@ -71,67 +64,8 @@ Page Custom PortableModePageCreate PortableModePageLeave
 
 !insertmacro MUI_LANGUAGE English
 
-; Installer log
-; Every run appends a step-by-step trace to a file so a failed upgrade on a
-; user's machine can be diagnosed after the fact. Kept in $TEMP rather than in
-; $INSTDIR because the previous version's uninstaller removes the whole install
-; directory part-way through an upgrade. Read it back with:
-;   notepad %TEMP%\Cockatrice-installer.log
-!macro CockLog text
-    Push "${text}"
-    Call CockLogWrite
-!macroend
-
-Function CockLogWrite
-    Pop $LogMessage
-    FileOpen $LogHandle "$InstallLogPath" a
-    ${If} $LogHandle == ""
-        Return
-    ${EndIf}
-    ; FileOpen places the pointer at the start of the file in every mode, so
-    ; 'a' alone would overwrite the log from the beginning on each line. Seek
-    ; past the existing content first to actually append.
-    FileSeek $LogHandle 0 END
-    FileWrite $LogHandle "$LogMessage$\r$\n"
-    FileClose $LogHandle
-FunctionEnd
-
-; Logs every file matching $INSTDIR\<mask>. Used to record the DLL inventory
-; before and after the upgrade purge, which is what shows whether Qt6Gui.dll was
-; on disk and what (if anything) survived the deletes.
-!macro CockLogListing label mask
-    Push "${label}"
-    Push "$INSTDIR\${mask}"
-    Call CockLogListing
-!macroend
-
-Function CockLogListing
-    Pop $LogMatchPattern
-    Pop $LogMatchLabel
-    !insertmacro CockLog "listing [$LogMatchLabel] pattern=$LogMatchPattern"
-    FindFirst $LogFindHandle $LogFindName "$LogMatchPattern"
-    ${If} $LogFindHandle == ""
-        !insertmacro CockLog "listing [$LogMatchLabel] (no matches)"
-        Return
-    ${EndIf}
-    log_listing_loop:
-        !insertmacro CockLog "listing [$LogMatchLabel] $LogFindName"
-        ClearErrors
-        FindNext $LogFindHandle $LogFindName
-        IfErrors 0 log_listing_loop
-    FindClose $LogFindHandle
-FunctionEnd
-
 Function .onInit
 
-StrCpy $InstallLogPath "$TEMP\Cockatrice-installer.log"
-; Start each run from a clean file so the log that gets sent back is the last
-; run, not every past run glued together.
-FileOpen $LogHandle "$InstallLogPath" w
-FileClose $LogHandle
-!insertmacro CockLog "=================================================================="
-!insertmacro CockLog "installer start: @CPACK_PACKAGE_NAME@ @CPACK_PACKAGE_VERSION@"
-
 ${If} ${NSIS_IS_64_BIT} == 1    #NSIS 64bit
     ${IfNot} ${RunningX64}
         MessageBox MB_OK|MB_ICONSTOP "This version of Cockatrice requires a 64-bit Windows system."
@@ -224,13 +158,6 @@ ${EndIf}
 ; Now that $PortableMode reflects reality, commit InstDir into the correct slot
 Call SetModeDestinationFromInstdir
 
-!insertmacro CockLog "options: InstDir=$InstDir PortableMode=$PortableMode ReinstallMode=$ReinstallMode WaitPid=$WaitPid"
-${If} ${Silent}
-    !insertmacro CockLog "options: running silently"
-${Else}
-    !insertmacro CockLog "options: interactive"
-${EndIf}
-
 ; Wait for the process that launched this installer to exit before anything is
 ; replaced or deleted. It goes first because it is the one check here that needs
 ; no powershell.exe: on a machine where the process lookup cannot run at all, the
@@ -248,14 +175,12 @@ ${EndIf}
 ; interactive installs the section re-checks after the directory page, when
 ; $INSTDIR is the directory the user actually picked.
 ${If} $ReinstallMode = 1
-    !insertmacro CockLog "reinstall: waiting for launcher and other instances"
     Call WaitForLauncherToExit
     Call EnsureAppsNotRunning
 ${EndIf}
 
 ${If} $ReinstallMode = 1
 ${AndIf} $PortableMode = 0
-    !insertmacro CockLog "reinstall: auto-uninstalling previous version"
     Call AutoUninstallIfNeeded
 ${EndIf}
 
@@ -301,23 +226,13 @@ Function AutoUninstallIfNeeded
 
 SetShellVarContext all
 
-; _?=$INSTDIR keeps the old uninstaller running in place. An NSIS uninstaller
-; normally copies itself to %TEMP% and runs from there so that it can delete its
-; own directory, and the process we started exits at once. ExecWait then returns
-; before the uninstall has run, and the temp copy keeps deleting files - from
-; 3.1.0 and 3.1.1 on disk a blanket "RMDir /r $INSTDIR" - while the section
-; below is still writing the new payload. _?= disables the copy and makes
-; ExecWait block until the uninstall finishes. It must be the last argument
-; and must not be quoted, even when the path contains spaces.
-;
 ; --- 32-bit uninstall ---
 SetRegView 32
 ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Cockatrice" "QuietUninstallString"
 
-!insertmacro CockLog "uninstall (32-bit): '$R0 _?=$INSTDIR'"
 StrCmp $R0 "" done32
 DetailPrint "Removing previous version (32-bit)..."
-ExecWait '$R0 _?=$INSTDIR'
+ExecWait '$R0'
 
 done32:
 
@@ -326,10 +241,9 @@ ${If} ${RunningX64}
     SetRegView 64
     ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Cockatrice" "QuietUninstallString"
 
-    !insertmacro CockLog "uninstall (64-bit): '$R0 _?=$INSTDIR'"
     StrCmp $R0 "" done64
     DetailPrint "Removing previous version (64-bit)..."
-    ExecWait '$R0 _?=$INSTDIR'
+    ExecWait '$R0'
 
     done64:
 ${EndIf}
@@ -446,7 +360,6 @@ Function WaitForAppToClose
     ; usage: set $R1 to the display name (e.g. "cockatrice.exe") and $R2 to the
     ; base image name (e.g. "cockatrice")
     Call IsAppRunning
-    !insertmacro CockLog "guard $R1: state=$R0 (dir=$GuardDir)"
     ; Only a definite "running" is worth waiting for. "Not running" is done, and
     ; "could not determine" must not keep the installer waiting on an answer it
     ; will never get - but it cannot simply be waved through either, see
@@ -471,7 +384,6 @@ Function WaitForAppToClose
         Sleep 500
         Call IsAppRunning
         ${If} $R0 = 0
-            !insertmacro CockLog "guard $R1: closed gracefully"
             DetailPrint "$R1 closed."
             Return
         ${EndIf}
@@ -490,7 +402,6 @@ Function WaitForAppToClose
         ; deck, and nothing has been replaced yet, so aborting just defers the
         ; update and preserves the user's data.
         ${If} $AllowForceClose = 0
-            !insertmacro CockLog "guard $R1: still running after 60s, aborting (no force close)"
             DetailPrint "$R1 is still running after 60 s; aborting the update so that no data is lost."
             StrCpy $AbortReason \
                 "$R1 did not close within 60 seconds, so the installation was aborted to avoid losing unsaved data.$\r$\n$\r$\nPlease close $R1 and run the installer again."
@@ -499,13 +410,11 @@ Function WaitForAppToClose
         ; Oracle and Servatrice are console applications: CloseMainWindow()
         ; returned false for them and waiting longer cannot help. They hold no
         ; unsaved user data, so stop them by PID.
-        !insertmacro CockLog "guard $R1: still running after 60s, force-stopping"
         DetailPrint "Force-stopping $R1 ..."
         Call ForceCloseApps
         Sleep 2000
         Call IsAppRunning
         ${If} $R0 = 0
-            !insertmacro CockLog "guard $R1: force-stopped"
             DetailPrint "$R1 closed."
             Return
         ${EndIf}
@@ -513,7 +422,6 @@ Function WaitForAppToClose
             Call HandleUnknownAppState
             Return
         ${EndIf}
-        !insertmacro CockLog "guard $R1: could not be stopped, aborting"
         DetailPrint "$R1 is still running after 60 s; aborting the update."
         StrCpy $AbortReason \
             "$R1 could not be stopped, so the installation was aborted.$\r$\n$\r$\nPlease close $R1 and run the installer again."
@@ -578,16 +486,8 @@ FunctionEnd
 ; Only the first of those two gets a dialog; the second reports through the log
 ; and the exit code.
 Function AbortInstall
-    !insertmacro CockLog "ABORT: $AbortReason"
-    !insertmacro CockLog "full installer log: $InstallLogPath"
-    ; Show a dialog whenever someone is at the keyboard to see it: an interactive
-    ; install, or the in-app updater's /R upgrade. The /R upgrade is silent, but
-    ; the client that launched the installer has already quit, so the user is
-    ; still there. Only a /S install without /R is attended by a package manager
-    ; and must go straight to the exit code.
-    ${If} $ReinstallMode = 1
-    ${OrIfNot} ${Silent}
-        MessageBox MB_OK|MB_ICONEXCLAMATION "$AbortReason$\r$\n$\r$\nA detailed installer log was written to:$\r$\n$InstallLogPath"
+    ${IfNot} ${Silent}
+        MessageBox MB_OK|MB_ICONEXCLAMATION "$AbortReason"
     ${EndIf}
     SetErrorLevel 1
     Abort
@@ -610,33 +510,17 @@ FunctionEnd
 ; falls back to the name based guard.
 Function WaitForLauncherToExit
     StrCpy $LauncherExited 0
-    !insertmacro CockLog "wait-launcher: pid='$WaitPid'"
     ${If} $WaitPid == ""
-        !insertmacro CockLog "wait-launcher: no pid given, falling back to name check"
         Return
     ${EndIf}
     ; PROCESS_SYNCHRONIZE is the only access this needs - enough to wait on the
     ; handle, and the least likely to be refused for a reason that has nothing to
     ; do with the upgrade.
-    ;
-    ; System.dll maps its output registers so that .rN writes $N and .RN writes
-    ; $RN. The caller reads $R0/$R1, so the uppercase .RN form is required; the
-    ; original .r0/.r1 wrote $0/$1 and left $R1 empty, which made the "did not
-    ; exit" test below compare "" against "0" and abort on every /PID= upgrade.
     ClearErrors
-    System::Call 'kernel32::OpenProcess(i 0x00100000, i 0, i $WaitPid) p.R0'
-    ; OpenProcess returns a null handle for a process that is already gone. The
-    ; System plugin does not raise the NSIS error flag from a called function's
-    ; return value, so ${Errors} alone never saw that case and the null handle was
-    ; passed straight to WaitForSingleObject. Fold a plugin failure into the same
-    ; null-handle case instead of reading a handle that was never written.
+    System::Call 'kernel32::OpenProcess(i 0x00100000, i 0, i $WaitPid) p.r0'
     ${If} ${Errors}
-        StrCpy $R0 0
-    ${EndIf}
-    ${If} $R0 == 0
     ; The launcher is gone - OpenProcess cannot open a dead process - which is
     ; exactly the state the wait was for.
-        !insertmacro CockLog "wait-launcher: already exited"
         DetailPrint "The application that started this installer has already exited."
         StrCpy $LauncherExited 1
         Return
@@ -645,16 +529,14 @@ Function WaitForLauncherToExit
     ; Same 60 s grace period the name based check uses, so a client that is slow
     ; to flush its card database does not get less room than it used to.
     ; WAIT_OBJECT_0 is 0; WAIT_TIMEOUT is 258 and a failed wait reports 0xFFFFFFFF.
-    System::Call 'kernel32::WaitForSingleObject(p R0, i 60000) i.R1'
-    System::Call 'kernel32::CloseHandle(p R0)'
+    System::Call 'kernel32::WaitForSingleObject(p r0, i 60000) i.r1'
+    System::Call 'kernel32::CloseHandle(p r0)'
     ${If} $R1 != 0
-        !insertmacro CockLog "wait-launcher: did not exit within 60s (wait=$R1)"
         DetailPrint "The application that started this installer did not exit within 60 s."
         StrCpy $AbortReason \
             "The application that started this update has not exited yet, so the installation was cancelled rather than replace files it is still using.$\r$\n$\r$\nPlease close Cockatrice and run the installer again."
         Call AbortInstall
     ${EndIf}
-    !insertmacro CockLog "wait-launcher: launcher exited"
     DetailPrint "The application that started this installer has exited."
     StrCpy $LauncherExited 1
 FunctionEnd
@@ -680,11 +562,9 @@ FunctionEnd
 Function GuardAppsNotRunning
     ; usage: set $GuardDir to the directory to guard, then call this
     Call IsProcessLookupAvailable
-    !insertmacro CockLog "guard: powershell available=$R0 dir=$GuardDir launcherExited=$LauncherExited"
     ${If} $R0 = 0
         ; Without PowerShell we cannot tell whether a running instance is
         ; holding locks on the files we are about to replace.
-        !insertmacro CockLog "guard: powershell unavailable, skipping instance check"
         DetailPrint "Could not start powershell.exe; skipping the running instance check. Close Cockatrice, Oracle and Servatrice manually if the installation reports a problem."
         ; On a silent upgrade that used to be a warning and nothing more, which
         ; left the very process that launched the installer free to go on
@@ -707,8 +587,7 @@ Function GuardAppsNotRunning
         ${EndIf}
         ; The user has to be told to close the applications by hand, but a /S
         ; install without /R is unattended and would block on this forever.
-        ${If} $ReinstallMode = 1
-        ${OrIfNot} ${Silent}
+        ${IfNot} ${Silent}
             MessageBox MB_OK|MB_ICONEXCLAMATION "This installer could not check whether Cockatrice is still running, because powershell.exe could not be started.$\r$\n$\r$\nPlease close Cockatrice, Oracle and Servatrice manually before continuing."
         ${EndIf}
         Return
@@ -754,11 +633,7 @@ Function IsExistingCockatriceInstall
     ; there to prove that it is one. Every Qt module Cockatrice links is part of
     ; the payload, so match them all: probing only Qt6Core.dll would miss a
     ; directory where that one file happened to be deletable and the others
-    ; were not. Qt6*.dll rather than *.dll on purpose: this function decides
-    ; whether a directory is ours, and a folder that merely holds some DLLs of
-    ; its own must not be purged. Qt6*.dll is enough even when only the protobuf
-    ; runtime survived, because the whole Qt set is mapped by the same process
-    ; that maps abseil_dll.dll and so is locked or free with it.
+    ; were not.
     StrCpy $R3 "Qt6*.dll"
     Call CheckStaleRuntimeMask
     ${If} ${FileExists} "$INSTDIR\qt.conf"
@@ -770,23 +645,36 @@ FunctionEnd
 ; the purge. NSIS silently skips whatever it cannot delete, so one surviving file
 ; is enough to prove that something still holds a lock on the install directory.
 ;
-; Any DLL at all counts, not a list of expected ones. The purge removes every
-; top-level DLL, so after it has run the only DLL that can still be there is one
-; it failed to delete, whatever its name. A mask per library family (Qt, then
-; OpenSSL, then zlib) is what let abseil_dll.dll through: it is in neither the
-; purge nor this check, so it survived a 3.0.2 to 3.1 update untouched, the new
-; executables were written next to it, and the client then failed to start with
-; "abseil_dll.dll is either not designed to run on Windows or it contains an
-; error". Probing *.dll has no list to fall out of date when the next
-; transitive dependency appears.
+; The masks below have to cover the purge above one for one. A check that only
+; probed named files could not see a locked Qt6Multimedia.dll or a Plugins
+; directory the purge was unable to remove, so the exact files that broke the
+; install were also the ones this check was blind to.
 Function HasStaleRuntimeFiles
     StrCpy $R0 0
-    StrCpy $R3 "*.dll"
+    StrCpy $R3 "Qt*.dll"
     Call CheckStaleRuntimeMask
+    StrCpy $R3 "libcrypto*.dll"
+    Call CheckStaleRuntimeMask
+    StrCpy $R3 "libssl*.dll"
+    Call CheckStaleRuntimeMask
+    StrCpy $R3 "zlib*.dll"
+    Call CheckStaleRuntimeMask
+    StrCpy $R3 "icu*.dll"
+    Call CheckStaleRuntimeMask
+    StrCpy $R3 "libeay32.dll"
+    Call CheckStaleRuntimeMask
+    StrCpy $R3 "ssleay32.dll"
+    Call CheckStaleRuntimeMask
+    ${If} $R0 = 1
+        Return
+    ${EndIf}
+    ${If} ${FileExists} "$INSTDIR\libmysql.dll"
+        StrCpy $R0 1
+        Return
+    ${EndIf}
     ; IfFileExists takes wildcards, so a Plugins directory the purge could not
     ; remove counts as a leftover too.
     ${If} ${FileExists} "$INSTDIR\Plugins\*.*"
-        !insertmacro CockLog "stale-runtime: Plugins directory survived the purge"
         StrCpy $R0 1
     ${EndIf}
 FunctionEnd
@@ -799,7 +687,6 @@ Function CheckStaleRuntimeMask
     ${EndIf}
     FindFirst $StaleFindHandle $StaleFindName "$INSTDIR\$R3"
     ${If} $StaleFindHandle != ""
-        !insertmacro CockLog "stale-runtime: '$StaleFindName' matched $R3 in $INSTDIR"
         StrCpy $R0 1
         FindClose $StaleFindHandle
     ${EndIf}
@@ -1038,10 +925,9 @@ ${If} $PortableMode = 0
     ; directory before letting it delete anything. The uninstall string is
     ; stashed away first, the check works on $R0.
     StrCpy $OldUninstallString $R0
-    !insertmacro CockLog "componentsPagePre: old 32-bit uninstall '$OldUninstallString _?=$INSTDIR'"
     Call EnsureOldInstallNotRunning
     ClearErrors
-    ExecWait "$OldUninstallString _?=$INSTDIR"
+    ExecWait "$OldUninstallString"
 
 	done32:
 
@@ -1061,10 +947,9 @@ ${If} $PortableMode = 0
 
 	    uninst64:
 	    StrCpy $OldUninstallString $R0
-	    !insertmacro CockLog "componentsPagePre: old 64-bit uninstall '$OldUninstallString _?=$INSTDIR'"
 	    Call EnsureOldInstallNotRunning
 	    ClearErrors
-	    ExecWait "$OldUninstallString _?=$INSTDIR"
+	    ExecWait "$OldUninstallString"
 
 		done64:
 	${EndIf}
@@ -1079,19 +964,15 @@ Section "Application" SecApplication
 SetShellVarContext all
 SetOutPath "$INSTDIR"
 
-!insertmacro CockLog "section: InstDir=$INSTDIR PortableMode=$PortableMode ReinstallMode=$ReinstallMode"
-
 ; No application instance may be running while any file below is deleted or
 ; replaced: both upgrade blocks start by removing the old executables and
 ; runtime DLLs, and NSIS silently skips whatever is locked, which is how an
-; install ends up with a mix of old and new runtimes next to the new executable.
-; The next start then fails with "The procedure entry point X could not be
-; located in the dynamic link library ...Qt6Network.dll" for the Qt ones, or
-; "abseil_dll.dll is either not designed to run on Windows or it contains an
-; error" for the protobuf ones. So the check has to come before the first
-; Delete/RMDir and not after it: an interactive install into an existing portable
-; directory with cockatrice.exe still running would otherwise delete the old
-; files under its feet.
+; install ends up with a mix of old and new Qt DLLs next to the new executable
+; ("The procedure entry point X could not be located in the dynamic link
+; library ...Qt6Network.dll"). So the check has to come before the first
+; Delete/RMDir and not after it - an interactive install into an existing
+; portable directory with cockatrice.exe still running would otherwise delete
+; the old files under its feet.
 ;
 ; It is skipped on the /R path: .onInit already ran it before
 ; AutoUninstallIfNeeded removed the previous installation, so by the time this
@@ -1106,39 +987,32 @@ ${EndIf}
 ${If} $PortableMode = 1
 ${AndIf} ${FileExists} "$INSTDIR\portable.dat"
 	; upgrade portable mode
-	!insertmacro CockLog "section: portable upgrade purge"
-	!insertmacro CockLogListing "before-portable-purge" "*.dll"
-	; plugins and translations are payload and are rewritten by the payload
-	; below, so removing them here is safe. sounds and themes are payload
-	; too - the default packs are rewritten below as well - but a portable
-	; user's custom sounds and themes live in exactly those folders, so a
-	; recursive purge here would delete user content along with the defaults.
-	; Stale default files from an older release are overwritten or replaced
-	; by the payload, never by a purge.
 	RMDir /r "$INSTDIR\plugins"
+	RMDir /r "$INSTDIR\sounds"
+	RMDir /r "$INSTDIR\themes"
 	RMDir /r "$INSTDIR\translations"
 	Delete "$INSTDIR\uninstall.exe"
 	Delete "$INSTDIR\cockatrice.exe"
 	Delete "$INSTDIR\oracle.exe"
 	Delete "$INSTDIR\servatrice.exe"
-	; Every top-level DLL, not a list of expected ones. The payload is written
-	; after this block, so a DLL the new build still needs is put straight back;
-	; what this has to guarantee is that nothing from the previous build is left
-	; to be loaded next to the new executables. Naming the families by hand is
-	; what let abseil_dll.dll through; see HasStaleRuntimeFiles.
-	Delete "$INSTDIR\*.dll"
+	Delete "$INSTDIR\Qt*.dll"
+	Delete "$INSTDIR\libmysql.dll"
+	Delete "$INSTDIR\icu*.dll"
+	Delete "$INSTDIR\libcrypto*.dll"
+	Delete "$INSTDIR\libssl*.dll"
+	Delete "$INSTDIR\libeay32.dll"
+	Delete "$INSTDIR\ssleay32.dll"
 	Delete "$INSTDIR\qt.conf"
 	Delete "$INSTDIR\qdebug.txt"
 	Delete "$INSTDIR\servatrice.sql"
 	Delete "$INSTDIR\servatrice.ini.example"
+	Delete "$INSTDIR\zlib*.dll"
 	RMDir "$INSTDIR"
-	!insertmacro CockLogListing "after-portable-purge" "*.dll"
 ${EndIf}
 
 ; Remove any runtime DLLs left over from older versions, so a mismatched
-; Qt/OpenSSL/protobuf set cannot survive next to the new executables.
+; Qt/OpenSSL set cannot survive next to the new executables.
 Call IsExistingCockatriceInstall
-!insertmacro CockLog "section: IsExistingCockatriceInstall=$R0"
 ; Remembered because the stale-runtime check below must only ever fire for a
 ; directory this installer recognised as a Cockatrice install. Scanning for
 ; leftovers in an unrelated directory (a first-time install into a folder that
@@ -1147,48 +1021,48 @@ Call IsExistingCockatriceInstall
 StrCpy $IsUpgrade $R0
 ${If} $PortableMode = 0
 ${AndIf} $R0 = 1
-	!insertmacro CockLog "section: non-portable upgrade purge"
-	!insertmacro CockLogListing "before-purge" "*.dll"
 	RMDir /r "$INSTDIR\Plugins"
-	Delete "$INSTDIR\*.dll"
-	!insertmacro CockLogListing "after-purge" "*.dll"
-	!insertmacro CockLogListing "after-plugins" "Plugins\*.*"
+	Delete "$INSTDIR\Qt*.dll"
+	Delete "$INSTDIR\libcrypto*.dll"
+	Delete "$INSTDIR\libssl*.dll"
+	Delete "$INSTDIR\zlib*.dll"
+	Delete "$INSTDIR\libmysql.dll"
+	Delete "$INSTDIR\icu*.dll"
+	Delete "$INSTDIR\libeay32.dll"
+	Delete "$INSTDIR\ssleay32.dll"
 ${EndIf}
 
-; Whatever was locked during the purge (by an instance that started while the
+; Whatever was locked during the purge - by an instance that started while the
 ; installer was running, or because the running instance check could not be
-; performed at all) is still on disk, and the new executables are about to be
+; performed at all - is still on disk, and the new executables are about to be
 ; written next to it. That mix is exactly what makes the next start fail with
 ; "The procedure entry point X could not be located in the dynamic link library
-; ...Qt6QuickWidgets.dll", "The code execution cannot proceed because
-; Qt6Multimedia.dll was not found", or "abseil_dll.dll is either not designed to
-; run on Windows or it contains an error", so stop here instead of compounding
-; it. Nothing of the new payload has been written at this point, so the next run,
-; with the applications closed, gets a clean install.
+; ...Qt6QuickWidgets.dll" or "The code execution cannot proceed because
+; Qt6Multimedia.dll was not found", so stop here instead of compounding it.
+; Nothing of the new payload has been written at this point, so the next run -
+; with the applications closed - gets a clean install.
 ${If} $IsUpgrade = 1
     Call HasStaleRuntimeFiles
-    !insertmacro CockLog "section: HasStaleRuntimeFiles=$R0"
 ${Else}
     StrCpy $R0 0
 ${EndIf}
 ${If} $R0 = 1
-    !insertmacro CockLog "section: aborting, files of a previous version survived the purge"
     DetailPrint "Files of a previous version could not be removed; aborting the installation."
     ; The in-app updater runs this installer silent and detached and never looks
     ; at its exit code, so the user has to be told what happened. A /S install
-    ; without /R is unattended (a package manager, for instance) and a message
+    ; without /R is unattended - a package manager, for instance - and a message
     ; box there would block forever, so that case only reports through the log
-    ; and the exit code. AbortInstall owns that decision.
-    StrCpy $AbortReason \
-        "The installation could not remove all files of a previous version of Cockatrice, most likely because it is still running or was started as administrator, and was cancelled rather than leave a mismatched install behind.$\r$\n$\r$\nPlease close Cockatrice, Oracle and Servatrice and run the installer again."
-    Call AbortInstall
+    ; and the exit code.
+    ${IfNot} ${Silent}
+        MessageBox MB_OK|MB_ICONEXCLAMATION \
+            "The installation could not remove all files of a previous version of Cockatrice, most likely because it is still running or was started as administrator, and was cancelled rather than leave a mismatched install behind.$\r$\n$\r$\nPlease close Cockatrice, Oracle and Servatrice and run the installer again."
+    ${EndIf}
+    SetErrorLevel 1
+    Abort
 ${EndIf}
 
 @CPACK_NSIS_EXTRA_PREINSTALL_COMMANDS@
-!insertmacro CockLog "section: writing payload to $INSTDIR"
 @CPACK_NSIS_FULL_INSTALL@
-!insertmacro CockLog "section: payload written"
-!insertmacro CockLogListing "final" "Qt6*.dll"
 
 ${If} $PortableMode = 0
 	WriteUninstaller "$INSTDIR\uninstall.exe"
@@ -1252,7 +1126,6 @@ ${If} $ReinstallMode = 1
         Exec '"$INSTDIR\cockatrice.exe"'
 ${EndIf}
 
-!insertmacro CockLog "section: application install complete"
 SectionEnd
 
 Section "Start menu item" SecStartMenu
@@ -1269,32 +1142,16 @@ Section "un.Application" UnSecApplication
 	SetShellVarContext all
 	StrCpy $R1 0
 
-	; Record whether this was a portable install before portable.dat is
-	; removed below.
+	; Record whether this was a portable install before the directory (and the
+	; portable.dat marker inside it) is removed below.
 	IfFileExists "$INSTDIR\portable.dat" 0 +2
 		StrCpy $R1 1
 
-	; Remove only what the installer wrote. The two lists below are generated
-	; by CPack from the staged install tree: one Delete per installed file and
-	; one non-recursive RMDir per installed directory, children first.
-	; Anything the user put in $INSTDIR - decks, pictures, portable data
-	; folders - is not on those lists and survives, and $INSTDIR itself is
-	; only removed when nothing else is left in it. An earlier version of this
-	; section ran a blanket "RMDir /r $INSTDIR" to keep build-tree artifacts
-	; out of a fresh reinstall; that also deleted user decks whenever a user
-	; had pointed their data folders into the install directory, so payload
-	; purity may never be bought at that price again.
-@CPACK_NSIS_DELETE_FILES@
-@CPACK_NSIS_DELETE_DIRECTORIES@
-
-	; Written by the installer itself, so absent from the staged payload
-	; above; qdebug.txt is app-generated log output next to the executables.
-	Delete "$INSTDIR\uninstall.exe"
-	Delete "$INSTDIR\portable.dat"
-	Delete "$INSTDIR\qdebug.txt"
-
-	; Succeeds only when no foreign files remain.
-	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"
 
diff --git a/cmake/Sanitizers.cmake b/cmake/Sanitizers.cmake
deleted file mode 100644
index 2e5d794de..000000000
--- a/cmake/Sanitizers.cmake
+++ /dev/null
@@ -1,109 +0,0 @@
-# AddressSanitizer + UndefinedBehaviorSanitizer opt-in, plus per-source opt-out
-# Input: ENABLE_SANITIZERS
-# Defines: cockatrice_disable_sanitizers_for
-#
-# Included once from the root CMakeLists.txt, immediately after the per-compiler flag
-# block, so add_compile_options() reaches every library and executable defined below.
-
-include(CheckCXXSourceCompiles)
-
-# Opt a set of vendored sources out of instrumentation.
-#
-# cockatrice_disable_sanitizers_for(<source> ...)
-#
-# Sanitizer findings inside vendored code are not actionable for us, and letting them
-# through buries our own bugs in noise until everyone learns to skip the job.
-#
-# The sources must be named relative to the directory that compiles them. CMake resolves a
-# source-file property against the directory scope the target was declared in, so calling
-# this from the root with absolute paths silently does nothing. That is why the call sites
-# live next to the add_library/add_executable that pull the vendored code in.
-#
-# SKIP_PRECOMPILE_HEADERS is not optional. The precompiled header is built with the
-# sanitizer flags, so it defines __SANITIZE_ADDRESS__; a translation unit compiled with
-# -fno-sanitize=all does not, and GCC then refuses the PCH with
-# "not used because __SANITIZE_ADDRESS__ not defined", which is a fatal -Werror=invalid-pch
-# in the servatrice and oracle builds.
-function(cockatrice_disable_sanitizers_for)
-  if(NOT ENABLE_SANITIZERS)
-    return()
-  endif()
-  set_source_files_properties(${ARGN} PROPERTIES COMPILE_OPTIONS "-fno-sanitize=all" SKIP_PRECOMPILE_HEADERS ON)
-endfunction()
-
-if(ENABLE_SANITIZERS)
-  # Probe a flag the way it will actually be used: on the compile step AND the link step.
-  # check_cxx_compiler_flag() only probes the compile step, which makes every sanitizer
-  # flag look unsupported because linking an ASan object without -fsanitize=address leaves
-  # __asan_init undefined. That is a silent misconfiguration rather than an error, so the
-  # probe has to link.
-  function(cockatrice_probe_flag FLAG VARNAME)
-    set(CMAKE_REQUIRED_FLAGS "${FLAG}")
-    set(CMAKE_REQUIRED_LINK_OPTIONS "${FLAG}")
-    check_cxx_source_compiles("int main() { return 0; }" ${VARNAME})
-    unset(CMAKE_REQUIRED_FLAGS)
-    unset(CMAKE_REQUIRED_LINK_OPTIONS)
-  endfunction()
-
-  set(SANITIZER_FLAGS
-      -fsanitize=address,undefined
-      -fno-omit-frame-pointer
-      # UBSan defaults to recover mode: it prints "runtime error: ..." but the
-      # process exits 0, so gtest/ctest report a pass and CI stays green.
-      # -fno-sanitize-recover makes the first finding abort instead. This is
-      # probed like the other cosmetic flags, but CI also sets
-      # UBSAN_OPTIONS=halt_on_error=1 as the runtime-side guarantee.
-      -fno-sanitize-recover=undefined
-      # Qt builds QObject subclasses into raw storage and writes the vptr afterwards, which
-      # the vptr check reports on essentially every QObject instantiation. The check has no
-      # value for us because nothing outside moc-generated code inherits QObject, so it is
-      # off outright rather than suppressed piecemeal.
-      -fno-sanitize=vptr
-  )
-
-  # MSVC has no ASan/UBSan equivalent, and clang-cl would need /fsanitize=address plus a
-  # matching runtime link, which is a separate piece of work.
-  if(MSVC)
-    message(FATAL_ERROR "ENABLE_SANITIZERS is not supported with MSVC")
-  endif()
-
-  # Probe rather than assume, so an older toolchain gets the sanitizers it can support
-  # instead of failing the build on a flag it does not recognize.
-  set(SANITIZER_SUPPORTED_FLAGS)
-  foreach(FLAG ${SANITIZER_FLAGS})
-    string(MAKE_C_IDENTIFIER "COCKATRICE_HAS${FLAG}" _FLAG_VAR)
-    cockatrice_probe_flag("${FLAG}" ${_FLAG_VAR})
-    if(${_FLAG_VAR})
-      list(APPEND SANITIZER_SUPPORTED_FLAGS ${FLAG})
-    else()
-      message(STATUS "Sanitizers: ${FLAG} unsupported by ${CMAKE_CXX_COMPILER_ID}, skipping")
-    endif()
-  endforeach()
-
-  # The whole point of the option is the sanitizers, so an unsupported pair is fatal even
-  # though the cosmetic flags above are allowed to degrade.
-  if(NOT "-fsanitize=address,undefined" IN_LIST SANITIZER_SUPPORTED_FLAGS)
-    message(FATAL_ERROR "ENABLE_SANITIZERS requires -fsanitize=address,undefined, which "
-                        "${CMAKE_CXX_COMPILER_ID} does not accept"
-    )
-  endif()
-
-  add_compile_options(${SANITIZER_SUPPORTED_FLAGS})
-  add_link_options(-fsanitize=address,undefined)
-
-  # Recorded so the test tree can label its entries and a plain `make` at the same time
-  # cannot quietly disagree with what CI ran.
-  set(COCKATRICE_SANITIZERS
-      ON
-      CACHE INTERNAL "AddressSanitizer and UBSan are enabled"
-  )
-else()
-  # ENABLE_SANITIZERS is OFF, but COCKATRICE_SANITIZERS is CACHE INTERNAL, so a
-  # reused build dir (e.g. CI's release-package step reconfiguring the same dir
-  # after the sanitized debug step) would otherwise keep skipping NO_SANITIZE
-  # tests and keep the 300s discovery timeout. Reset it explicitly.
-  set(COCKATRICE_SANITIZERS
-      OFF
-      CACHE INTERNAL "AddressSanitizer and UBSan are enabled" FORCE
-  )
-endif()
diff --git a/cmake/pch/qtcore_pch.h b/cmake/pch/qtcore_pch.h
index 176f2939c..cc3dd12ee 100644
--- a/cmake/pch/qtcore_pch.h
+++ b/cmake/pch/qtcore_pch.h
@@ -3,53 +3,22 @@
  *
  * Safe for every target that links Qt Core, including the headless
  * Servatrice binary. Keep this header free of any widget/gui types.
- *
- * Candidates are chosen from IWYU include statistics: a header earns a
- * spot when it is not already reachable from the rest of this list and
- * enough translation units re-parse it. Qt headers are stable across
- * builds, so the precompiled header rarely invalidates.
  */
 
 #include <QBasicTimer>
 #include <QByteArray>
-#include <QCommandLineParser>
-#include <QCoreApplication>
-#include <QCryptographicHash>
 #include <QDateTime>
 #include <QDebug>
-#include <QDir>
-#include <QElapsedTimer>
 #include <QFile>
-#include <QFileInfo>
 #include <QHash>
-#include <QItemSelectionModel>
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonValue>
 #include <QList>
 #include <QLoggingCategory>
 #include <QMap>
-#include <QMetaEnum>
 #include <QMetaObject>
-#include <QMutex>
-#include <QMutexLocker>
 #include <QObject>
-#include <QPointer>
-#include <QPropertyAnimation>
 #include <QRandomGenerator>
-#include <QReadWriteLock>
-#include <QRegularExpression>
-#include <QSet>
-#include <QSettings>
 #include <QSharedPointer>
-#include <QSortFilterProxyModel>
 #include <QString>
 #include <QStringList>
-#include <QTemporaryDir>
-#include <QThread>
 #include <QTimer>
-#include <QUuid>
 #include <QVariant>
-#include <QXmlStreamReader>
-#include <QXmlStreamWriter>
diff --git a/cmake/pch/qtwidgets_pch.h b/cmake/pch/qtwidgets_pch.h
index 030bec69c..2c63f450e 100644
--- a/cmake/pch/qtwidgets_pch.h
+++ b/cmake/pch/qtwidgets_pch.h
@@ -4,56 +4,27 @@
  * 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).
- *
- * Candidates are chosen from IWYU include statistics: a header earns a
- * spot when it is not already reachable from the rest of this list and
- * enough translation units re-parse it. Qt headers are stable across
- * builds, so the precompiled header rarely invalidates.
  */
 
 #include "qtcore_pch.h"
 
 #include <QAction>
 #include <QApplication>
-#include <QCheckBox>
-#include <QComboBox>
-#include <QCompleter>
-#include <QDialogButtonBox>
-#include <QDockWidget>
-#include <QFileDialog>
-#include <QFormLayout>
 #include <QFrame>
 #include <QGraphicsItem>
 #include <QGraphicsScene>
-#include <QGraphicsSceneMouseEvent>
 #include <QGraphicsView>
-#include <QGridLayout>
-#include <QGroupBox>
-#include <QHBoxLayout>
-#include <QHeaderView>
 #include <QImage>
-#include <QImageReader>
-#include <QInputDialog>
 #include <QLabel>
 #include <QLayout>
-#include <QListWidget>
 #include <QMainWindow>
 #include <QMenu>
-#include <QMessageBox>
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
 #include <QPainter>
-#include <QPlainTextEdit>
 #include <QPushButton>
 #include <QScrollArea>
-#include <QSpinBox>
-#include <QSplitter>
-#include <QStandardItemModel>
 #include <QTabWidget>
-#include <QTableWidget>
-#include <QTableWidgetItem>
 #include <QToolBar>
-#include <QToolButton>
 #include <QTreeWidget>
-#include <QVBoxLayout>
 #include <QWidget>
diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt
index 63ce7d1af..1760d86b8 100644
--- a/cockatrice/CMakeLists.txt
+++ b/cockatrice/CMakeLists.txt
@@ -59,7 +59,6 @@ set(cockatrice_SOURCES
     src/interface/widgets/dialogs/dlg_update.cpp
     src/interface/widgets/dialogs/dlg_view_log.cpp
     src/interface/widgets/dialogs/override_printing_warning.cpp
-    src/interface/widgets/dialogs/path_safety_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
@@ -141,10 +140,6 @@ set(cockatrice_SOURCES
     src/game_graphics/zones/view_zone.cpp
     src/game_graphics/zones/view_zone_widget.cpp
     src/game_graphics/board/abstract_graphics_item.cpp
-    src/interface/card_database_update/card_database_update_status_bar.cpp
-    src/interface/card_database_update/card_database_update_status_bar.h
-    src/interface/card_database_update/card_update_progress.cpp
-    src/interface/card_database_update/card_update_progress.h
     src/interface/card_picture_loader/card_picture_loader.cpp
     src/interface/card_picture_loader/card_picture_loader_local.cpp
     src/interface/card_picture_loader/card_picture_loader_request_status_display_widget.cpp
@@ -692,7 +687,7 @@ if(WIN32)
   # import table, and the glob above only sees DLLs that were already copied next
   # to the executable. Qt6::Concurrent is linked but never imported - QtConcurrent::run
   # and QFutureWatcher are header-only in Qt 6 - so neither step ships
-  # Qt6Concurrent.dll, even though required-runtime.txt lists it and the
+  # Qt6Concurrent.dll, even though required-qt-runtime.txt lists it and the
   # Windows package check then fails on a package that is fine to run.
   # Qt6::ShaderTools is skipped for the same reason.
   #
diff --git a/cockatrice/cockatrice.desktop b/cockatrice/cockatrice.desktop
index 70db9d472..4b15fa9c1 100644
--- a/cockatrice/cockatrice.desktop
+++ b/cockatrice/cockatrice.desktop
@@ -6,4 +6,5 @@ Name=Cockatrice
 Exec=cockatrice %U
 Icon=cockatrice
 Categories=Game;CardGame;
-MimeType=application/x-cockatrice;x-scheme-handler/cockatrice;
+MimeType=application/x-cockatrice;
+X-Scheme-Handler/cockatrice=true
diff --git a/cockatrice/cockatrice_en@source.ts b/cockatrice/cockatrice_en@source.ts
index 426822209..e06972ddc 100644
--- a/cockatrice/cockatrice_en@source.ts
+++ b/cockatrice/cockatrice_en@source.ts
@@ -4,7 +4,7 @@
 <context>
     <name>AbstractCounter</name>
     <message>
-        <location filename="src/game_graphics/board/abstract_counter.cpp" line="87"/>
+        <location filename="src/game_graphics/board/abstract_counter.cpp" line="85"/>
         <source>&amp;Set counter...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12,12 +12,12 @@
 <context>
     <name>AbstractCounterDialog</name>
     <message>
-        <location filename="src/game_graphics/board/abstract_counter.cpp" line="199"/>
+        <location filename="src/game_graphics/board/abstract_counter.cpp" line="197"/>
         <source>Set counter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/board/abstract_counter.cpp" line="200"/>
+        <location filename="src/game_graphics/board/abstract_counter.cpp" line="198"/>
         <source>New value for counter &apos;%1&apos;:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -38,113 +38,64 @@
 <context>
     <name>AbstractTabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="222"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="216"/>
         <source>Open in new tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="247"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="241"/>
         <source>Are you sure?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="248"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="242"/>
         <source>The decklist has been modified.
 Do you want to save the changes?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="305"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="321"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="346"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="376"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="416"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="545"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="299"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="315"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="339"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="369"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="388"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="517"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="305"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="299"/>
         <source>Could not open deck at %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="321"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="315"/>
         <source>Could not save remote deck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="347"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="377"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="340"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="370"/>
         <source>The deck could not be saved.
 Please check that the directory is writable and try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="359"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="352"/>
         <source>Save deck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="395"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="401"/>
-        <source>Share deck</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="395"/>
-        <source>You must be connected to the server to share a deck.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="401"/>
-        <source>The deck is empty. Add cards before sharing it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="416"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="388"/>
         <source>The deck could not be saved.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="545"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="517"/>
         <source>There are no cards in your deck to be exported</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>AccountSetupPage</name>
-    <message>
-        <location filename="src/interface/widgets/onboarding/pages/account_setup_page.cpp" line="42"/>
-        <source>Join a Server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/onboarding/pages/account_setup_page.cpp" line="47"/>
-        <source>Optional — you can always do this later from the menu.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/onboarding/pages/account_setup_page.cpp" line="52"/>
-        <source>Playing online needs a server account.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/onboarding/pages/account_setup_page.cpp" line="53"/>
-        <source>Register a new account…</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/onboarding/pages/account_setup_page.cpp" line="54"/>
-        <source>I already have one — Connect…</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/onboarding/pages/account_setup_page.cpp" line="55"/>
-        <source>Just want to play locally? Skip this and connect whenever you&apos;re ready.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>AddAnalyticsPanelDialog</name>
     <message>
@@ -156,12 +107,12 @@ Please check that the directory is writable and try again.</source>
 <context>
     <name>AdminNotesDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_dialog.cpp" line="283"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="298"/>
         <source>Update Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_dialog.cpp" line="296"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="311"/>
         <source>Admin Notes for %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -187,304 +138,218 @@ Please check that the directory is writable and try again.</source>
 <context>
     <name>AppearanceSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="132"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="93"/>
         <source> seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="433"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="329"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="433"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="329"/>
         <source>Could not create themes directory at &apos;%1&apos;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="509"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="399"/>
         <source>Theme settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="510"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="400"/>
         <source>Current theme:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="511"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="401"/>
         <source>Open themes folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="518"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="406"/>
         <source>Home tab background source:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="519"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="407"/>
         <source>Home tab background shuffle frequency:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="520"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="408"/>
         <source>Disabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="538"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="414"/>
         <source>Menu settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="539"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="415"/>
         <source>Show keyboard shortcuts in right-click menus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="540"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="416"/>
         <source>Show game filter toolbar above list in room tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="548"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="424"/>
         <source>Card rendering</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="549"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="425"/>
         <source>Display card names on cards having a picture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="550"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="426"/>
         <source>Auto-Rotate cards with sideways layout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="544"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="420"/>
         <source>Override all card art with personal set preference (Pre-ProviderID change behavior)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="46"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="34"/>
         <source>Light</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="47"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="35"/>
         <source>Dark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="49"/>
-        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="63"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="37"/>
         <source>System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="169"/>
-        <source>Show all playmats</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="170"/>
-        <source>Show own playmat only</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="171"/>
-        <source>Don&apos;t use playmats</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="182"/>
-        <source>Override deck playmat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="183"/>
-        <source>Fallback if deck has none</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="184"/>
-        <source>Deck only, ignore collection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="512"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="402"/>
         <source>Active theme palette:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="513"/>
-        <source>Active theme style:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="514"/>
-        <source>Qt widget style saved to this theme (&quot;System&quot; lets the application decide)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="515"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="403"/>
         <source>Edit theme palette</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="517"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="405"/>
         <source>Home tab settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="521"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="409"/>
         <source>Display card name of background in bottom right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="522"/>
-        <source>Dim the home tab background</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="524"/>
-        <source>Draw a translucent overlay over the home tab background so buttons and text stand out</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="525"/>
-        <source>Home tab button color:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="527"/>
-        <source>Use the theme&apos;s identity accent colors, or extract colors from the background image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="529"/>
-        <source>Playmat settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="530"/>
-        <source>Playmat visibility:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="531"/>
-        <source>Default collection behavior:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="532"/>
-        <source>Default playmat collection:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="533"/>
-        <source>Edit...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="535"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="411"/>
         <source>Styling settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="536"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="412"/>
         <source>Style user list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="542"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="418"/>
         <source>Card printings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="546"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="422"/>
         <source>Bump sets that the deck contains cards from to the top in the printing selector</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="551"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="427"/>
         <source>Scale cards on mouse over</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="552"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="428"/>
         <source>Use rounded card corners</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="555"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="431"/>
         <source>Card layout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="557"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="433"/>
         <source>Minimum overlap percentage of cards on the stack and in vertical hand</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="558"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="434"/>
         <source>Maximum initial height for card view window:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="559"/>
-        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="561"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="435"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="437"/>
         <source> rows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="560"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="436"/>
         <source>Maximum expanded height for card view window:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="563"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="439"/>
         <source>Card counters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="567"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="443"/>
         <source>Counter %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="570"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="446"/>
         <source>Hand layout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="571"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="447"/>
         <source>Display hand horizontally (wastes space)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="572"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="448"/>
         <source>Enable left justification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="574"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="450"/>
         <source>Table grid layout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="575"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="451"/>
         <source>Invert vertical coordinate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="576"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="452"/>
         <source>Minimum player count for multi-column layout:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="553"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="429"/>
         <source>Maximum font size for information displayed on cards:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -492,12 +357,12 @@ Please check that the directory is writable and try again.</source>
 <context>
     <name>ArchidektApiResponseDeckDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="141"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="136"/>
         <source>Back to results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="142"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="137"/>
         <source>Open Deck in Deck Editor</source>
         <translation type="unfinished"></translation>
     </message>
@@ -523,111 +388,111 @@ Please check that the directory is writable and try again.</source>
 <context>
     <name>BanDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_dialog.cpp" line="20"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="39"/>
         <source>ban &amp;user name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_dialog.cpp" line="24"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="43"/>
         <source>ban &amp;IP address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_dialog.cpp" line="28"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="47"/>
         <source>ban client I&amp;D</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_dialog.cpp" line="43"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="62"/>
         <source>Ban type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_dialog.cpp" line="46"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="65"/>
         <source>&amp;permanent ban</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_dialog.cpp" line="47"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="66"/>
         <source>&amp;temporary ban</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_dialog.cpp" line="50"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="69"/>
         <source>&amp;Days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_dialog.cpp" line="56"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="75"/>
         <source>&amp;Hours:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_dialog.cpp" line="62"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="81"/>
         <source>&amp;Minutes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_dialog.cpp" line="77"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="96"/>
         <source>Duration of the ban</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_dialog.cpp" line="80"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="99"/>
         <source>Please enter the reason for the ban.
 This is only saved for moderators and cannot be seen by the banned person.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_dialog.cpp" line="85"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="104"/>
         <source>Please enter the reason for the ban that will be visible to the banned person.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_dialog.cpp" line="88"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="107"/>
         <source>Redact all messages from this user in all rooms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_dialog.cpp" line="90"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="109"/>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_dialog.cpp" line="93"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="112"/>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_dialog.cpp" line="112"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="131"/>
         <source>Ban user from server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_dialog.cpp" line="198"/>
-        <location filename="src/interface/widgets/server/user/user_list_dialog.cpp" line="206"/>
-        <location filename="src/interface/widgets/server/user/user_list_dialog.cpp" line="214"/>
-        <location filename="src/interface/widgets/server/user/user_list_dialog.cpp" line="223"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="213"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="221"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="229"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="238"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_dialog.cpp" line="199"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="214"/>
         <source>You have to select a name-based, IP-based, clientId based, or some combination of the three to place a ban.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_dialog.cpp" line="207"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="222"/>
         <source>You must have a value in the name ban when selecting the name ban checkbox.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_dialog.cpp" line="215"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="230"/>
         <source>You must have a value in the ip ban when selecting the ip ban checkbox.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_dialog.cpp" line="224"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="239"/>
         <source>You must have a value in the clientid ban when selecting the clientid ban checkbox.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -635,22 +500,22 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>BetaReleaseChannel</name>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="266"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="211"/>
         <source>Beta</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="292"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="237"/>
         <source>No reply received from the release update server.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="301"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="246"/>
         <source>Invalid reply received from the release update server.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="335"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="280"/>
         <source>No reply received from the file update server.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -658,20 +523,7 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CardArtPreviewWidget</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="48"/>
-        <source>Banner preview</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="49"/>
-        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="69"/>
-        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="177"/>
-        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="197"/>
-        <source>Zoom %1×</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="112"/>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="65"/>
         <source>No card selected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -679,22 +531,22 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CardArtRulesModel</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="66"/>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="65"/>
         <source>Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="68"/>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="67"/>
         <source>ProviderId</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="70"/>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="69"/>
         <source>Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="72"/>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="71"/>
         <source>Reason</source>
         <translation type="unfinished"></translation>
     </message>
@@ -702,209 +554,65 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CardDatabaseModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="69"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="68"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="71"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="70"/>
         <source>Sets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="73"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="72"/>
         <source>Mana cost</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="75"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="74"/>
         <source>Card type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="77"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="76"/>
         <source>P/T</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="79"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="78"/>
         <source>Color(s)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>CardDatabaseSetupPage</name>
-    <message>
-        <location filename="src/interface/widgets/onboarding/pages/card_database_setup_page.cpp" line="172"/>
-        <location filename="src/interface/widgets/onboarding/pages/card_database_setup_page.cpp" line="276"/>
-        <source>Press Download to fetch the card database, or Skip to do it later.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/onboarding/pages/card_database_setup_page.cpp" line="193"/>
-        <source>Downloading the card database (%1%)…</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/onboarding/pages/card_database_setup_page.cpp" line="195"/>
-        <source>Parsing the card database (%1%)…</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/onboarding/pages/card_database_setup_page.cpp" line="197"/>
-        <source>Importing cards (%1%)…</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/onboarding/pages/card_database_setup_page.cpp" line="204"/>
-        <source>Download</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/onboarding/pages/card_database_setup_page.cpp" line="219"/>
-        <source>▼  Advanced: custom download source</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/onboarding/pages/card_database_setup_page.cpp" line="220"/>
-        <source>▶  Advanced: custom download source</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/onboarding/pages/card_database_setup_page.cpp" line="247"/>
-        <source>Invalid URL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/onboarding/pages/card_database_setup_page.cpp" line="248"/>
-        <source>That doesn&apos;t look like a valid URL. Double-check it and try again, or clear the field to use the default source.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/onboarding/pages/card_database_setup_page.cpp" line="279"/>
-        <source>Downloading the latest card database…</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/onboarding/pages/card_database_setup_page.cpp" line="282"/>
-        <source>Card database ready ✓</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/onboarding/pages/card_database_setup_page.cpp" line="286"/>
-        <source>Couldn&apos;t download the card database automatically. Check your connection and retry, set it up manually, or skip this for now — you can do it later from the Card Database menu.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/onboarding/pages/card_database_setup_page.cpp" line="306"/>
-        <source>Card Database</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/onboarding/pages/card_database_setup_page.cpp" line="311"/>
-        <source>Cockatrice needs card data to know what you&apos;re playing with.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/onboarding/pages/card_database_setup_page.cpp" line="316"/>
-        <source>Retry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/onboarding/pages/card_database_setup_page.cpp" line="317"/>
-        <source>Set up manually…</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/onboarding/pages/card_database_setup_page.cpp" line="320"/>
-        <source>Leave blank to use the default source</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/onboarding/pages/card_database_setup_page.cpp" line="321"/>
-        <source>Only change this if you know you need a mirror or a custom card data source.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/onboarding/pages/card_database_setup_page.cpp" line="322"/>
-        <source>Restore default</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/onboarding/pages/card_database_setup_page.cpp" line="323"/>
-        <source>Apply &amp;&amp; retry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/onboarding/pages/card_database_setup_page.cpp" line="325"/>
-        <source>Check for card database updates on startup</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/onboarding/pages/card_database_setup_page.cpp" line="326"/>
-        <source>Don&apos;t check</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/onboarding/pages/card_database_setup_page.cpp" line="327"/>
-        <source>Prompt for update</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/onboarding/pages/card_database_setup_page.cpp" line="328"/>
-        <source>Always update in the background</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/onboarding/pages/card_database_setup_page.cpp" line="330"/>
-        <source>Check for card database updates every</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/onboarding/pages/card_database_setup_page.cpp" line="331"/>
-        <source> days</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>CardDatabaseView</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="143"/>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="135"/>
         <source>Add to Deck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="144"/>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="136"/>
         <source>Add to Sideboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="145"/>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="137"/>
         <source>Select Printing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="153"/>
-        <source>Add to Zone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="186"/>
-        <source>Create &amp;new zone...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="197"/>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="145"/>
         <source>Show on EDHRec (Commander)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="200"/>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="148"/>
         <source>Show on EDHRec (Card)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="204"/>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="152"/>
         <source>Show Related cards</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1014,22 +722,22 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CardInfoFrameWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="69"/>
+        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="68"/>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="70"/>
+        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="69"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="71"/>
+        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="70"/>
         <source>Both</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="74"/>
+        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="73"/>
         <source>View transformation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1037,22 +745,22 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CardInfoPictureWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="371"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="373"/>
         <source>View related cards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="416"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="418"/>
         <source>Add card to deck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="429"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="431"/>
         <source>Mainboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="435"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="437"/>
         <source>Sideboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1060,27 +768,27 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CardInfoTextWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="70"/>
+        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="63"/>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="76"/>
+        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="69"/>
         <source>Set:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="78"/>
+        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="71"/>
         <source>Collector Number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="93"/>
+        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="86"/>
         <source>Related cards:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="110"/>
+        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="102"/>
         <source>Unknown card:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1088,129 +796,129 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CardMenu</name>
     <message>
-        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="313"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="312"/>
         <source>Re&amp;veal to...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="491"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="490"/>
         <source>&amp;All players</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="396"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="395"/>
         <source>View related cards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="443"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="442"/>
         <source>Token: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="460"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="459"/>
         <source>All tokens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="484"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="483"/>
         <source>&amp;Select All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="485"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="484"/>
         <source>S&amp;elect Row</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="486"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="485"/>
         <source>S&amp;elect Column</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="488"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="487"/>
         <source>&amp;Play</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="489"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="488"/>
         <source>&amp;Hide</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="490"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="489"/>
         <source>Play &amp;Face Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="493"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="492"/>
         <source>&amp;Tap / Untap</source>
         <extracomment>Turn sideways or back again</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="494"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="493"/>
         <source>Skip &amp;untapping</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="496"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="495"/>
         <source>T&amp;urn Over</source>
         <extracomment>Turn face up/face down</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="499"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="498"/>
         <source>&amp;Peek at card face</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="500"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="499"/>
         <source>&amp;Clone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="501"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="500"/>
         <source>Attac&amp;h to card...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="502"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="501"/>
         <source>Unattac&amp;h</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="503"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="502"/>
         <source>&amp;Draw arrow...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="504"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="503"/>
         <source>&amp;Set annotation...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="505"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="504"/>
         <source>Reduce life by power</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="507"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="506"/>
         <source>Ca&amp;rd counters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="512"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="511"/>
         <source>&amp;Add counter (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="515"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="514"/>
         <source>&amp;Remove counter (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="518"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="517"/>
         <source>&amp;Set counters (%1)...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1231,7 +939,7 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CardSizeWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_size_widget.cpp" line="23"/>
+        <location filename="src/interface/widgets/cards/card_size_widget.cpp" line="20"/>
         <source>Card Size</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1371,24 +1079,6 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>ChatView</name>
-    <message>
-        <location filename="src/interface/widgets/server/chat_view/chat_view.cpp" line="250"/>
-        <source>Join game &quot;%1&quot; (#%2) on %3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/chat_view/chat_view.cpp" line="252"/>
-        <source>Join game #%1 on %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/chat_view/chat_view.cpp" line="255"/>
-        <source>Join game</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>CockatriceXml3Parser</name>
     <message>
@@ -1418,155 +1108,63 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>CommanderBracketNames</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/commander_spellbook/commander_spellbook_bracket_explainer.h" line="7"/>
-        <source>CommanderSpellbook</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/commander_spellbook/commander_spellbook_bracket_explainer.h" line="8"/>
-        <source>Official (approximate)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/commander_spellbook/commander_spellbook_bracket_explainer.h" line="9"/>
-        <source>The bracket system combines both objective data, as well as subjective play experience to estimate a bracket for a deck.
-CommanderSpellbook&apos;s estimation is algorithmical, which means that it can only operate on the objective data, not the subjective intent. 
-They have chosen to represent this by defining their own bracket system which matches their algorithm.
-This custom bracket system maps loosely to the standard system. 
-You may choose to use these mapped standardized names if these are more familiar to you, however, you should keep in mind that these are just rough estimations.
-
-Always consider the subjective factors of the bracket system when determing a deck&apos;s final bracket!</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CommanderBracketWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_widget.cpp" line="22"/>
-        <location filename="src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_widget.cpp" line="267"/>
-        <source>Bracket:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_widget.cpp" line="82"/>
-        <source>CommanderSpellbook integration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_widget.cpp" line="87"/>
-        <source>CommanderSpellbook can analyze your deck and estimate its Commander bracket.
-
-This sends your deck list to an external service.
-
-CommanderSpellbook uses its own bracket naming system based on their own algorithm. These names can be mapped to the official Commander brackets, but the mapping is only an approximation.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_widget.cpp" line="98"/>
-        <source>CommanderSpellbook bracket names</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_widget.cpp" line="99"/>
-        <source>Official Commander bracket names (approximate)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_widget.cpp" line="108"/>
-        <source>Bracket naming:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_widget.cpp" line="125"/>
-        <source>Enable</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_widget.cpp" line="126"/>
-        <source>Automatic</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_widget.cpp" line="127"/>
-        <source>Disable</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_widget.cpp" line="174"/>
-        <source>Calculating…</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_widget.cpp" line="268"/>
-        <source>Why this bracket?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_widget.cpp" line="269"/>
-        <source>Recalculate bracket</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>ConnectionController</name>
     <message>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="138"/>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="313"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="134"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="300"/>
         <source>The server has reached its maximum user capacity, please check back later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="142"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="138"/>
         <source>There are too many concurrent connections from your address.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="146"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="142"/>
         <source>Banned by moderator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="149"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="145"/>
         <source>Expected end time: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="151"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="147"/>
         <source>This ban lasts indefinitely.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="159"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="155"/>
         <source>Scheduled server shutdown.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="163"/>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="551"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="159"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="538"/>
         <source>Invalid username.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="167"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="163"/>
         <source>You have been logged out due to logging in at another location.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="174"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="170"/>
         <source>Connection closed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="175"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="171"/>
         <source>The server has terminated your connection.
 Reason: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="180"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="176"/>
         <source>The server is going to be restarted in %n minute(s).
 All running games will be lost.
 Reason for shutdown: %1</source>
@@ -1576,227 +1174,217 @@ Reason for shutdown: %1</source>
         </translation>
     </message>
     <message>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="185"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="181"/>
         <source>Scheduled server shutdown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="223"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="219"/>
         <source>Failed Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="224"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="220"/>
         <source>Your client seems to be missing features this server requires for connection.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="225"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="221"/>
         <source>To update your client, go to &apos;Help -&gt; Check for Client Updates&apos;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="232"/>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="239"/>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="252"/>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="257"/>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="262"/>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="271"/>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="279"/>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="318"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="228"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="235"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="248"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="253"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="258"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="267"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="275"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="305"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="363"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="367"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="371"/>
         <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="376"/>
         <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="380"/>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="384"/>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="389"/>
         <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="393"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="400"/>
         <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="406"/>
         <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="413"/>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="419"/>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="426"/>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="433"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="420"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="233"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="229"/>
         <source>Incorrect username or password. Please check your authentication information and try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="240"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="236"/>
         <source>There is already an active session using this user name.
 Please close that session first and re-login.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="247"/>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="371"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="243"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="358"/>
         <source>You are banned until %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="248"/>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="372"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="244"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="359"/>
         <source>You are banned indefinitely.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="263"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="259"/>
         <source>This server requires user registration. Do you want to register now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="272"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="268"/>
         <source>This server requires client IDs. Your client is either failing to generate an ID or you are running a modified client.
 Please close and reopen your client to try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="280"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="276"/>
         <source>An internal error has occurred, please close and reopen Cockatrice before trying again.
 If the error persists, ensure you are running the latest version of the software and if needed contact the software developers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="289"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="285"/>
         <source>Account activation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="290"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="286"/>
         <source>Your account has not been activated yet.
 You need to provide the activation token received in the activation email.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="304"/>
-        <source>Password Change Required</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="305"/>
-        <source>An administrator has reset your password. Please contact your server administrator to obtain your temporary password, then log in and change it via Account -&gt; Change Password.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="312"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="299"/>
         <source>Server Full</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="319"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="306"/>
         <source>Unknown login error: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="320"/>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="395"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="307"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="382"/>
         <source>
 This usually means that your client version is out of date, and the server sent a reply your client doesn&apos;t understand.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="334"/>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="339"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="321"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="326"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="331"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="340"/>
         <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="344"/>
         <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="353"/>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="357"/>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="366"/>
         <source>Registration denied</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="335"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="322"/>
         <source>Registration is currently disabled on this server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="340"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="327"/>
         <source>There is already an existing account with the same user name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="345"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="332"/>
         <source>It&apos;s mandatory to specify a valid email address when registering.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="358"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="345"/>
         <source>It appears you are attempting to register a new account on this server yet you already have an account registered with the email provided. This server restricts the number of accounts a user can register per address. Please contact the server operator for further assistance or to obtain your credential information.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="366"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="353"/>
         <source>Password too short.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="385"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="372"/>
         <source>Registration failed for a technical problem on the server.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="389"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="376"/>
         <source>The connection to the server has been lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="394"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="381"/>
         <source>Unknown registration error: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="406"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="393"/>
         <source>Account activation failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="413"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="400"/>
         <source>Socket error: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="419"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="406"/>
         <source>Server timeout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="427"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="414"/>
         <source>You are trying to connect to an obsolete server. Please downgrade your Cockatrice version or connect to a suitable server.
 Local version is %1, remote version is %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="434"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="421"/>
         <source>Your Cockatrice client is obsolete. Please update your Cockatrice version.
 Local version is %1, remote version is %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="443"/>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="453"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="430"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="440"/>
         <source>Success</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="443"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="430"/>
         <source>Registration accepted.
 Will now login.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="453"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="440"/>
         <source>Account activation accepted.
 Will now login.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="459"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="446"/>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="460"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="447"/>
         <source>This server supports additional features that your client doesn&apos;t have.
 This is most likely not a problem, but this message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version.
 
@@ -1804,113 +1392,113 @@ To update your client, go to Help -&gt; Check for Updates.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="469"/>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="479"/>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="488"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="456"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="466"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="475"/>
         <source>Reset Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="470"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="457"/>
         <source>Your password has been reset successfully, you can now log in using the new credentials.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="480"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="467"/>
         <source>Failed to reset user account password, please contact the server operator to reset your password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="489"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="476"/>
         <source>Activation request received, please check your email for an activation token.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="513"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="500"/>
         <source>Connecting to %1...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="518"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="505"/>
         <source>Registering to %1 as %2...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="522"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="509"/>
         <source>Disconnected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="526"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="513"/>
         <source>Connected, logging in at %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="537"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="524"/>
         <source>Requesting forgotten password to %1 as %2...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="555"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="542"/>
         <source>Your username must respect these rules:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="557"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="544"/>
         <source>is %1 - %2 characters long</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="558"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="545"/>
         <source>can %1 contain lowercase characters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="558"/>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="560"/>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="563"/>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="570"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="545"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="547"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="550"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="557"/>
         <source>NOT</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="560"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="547"/>
         <source>can %1 contain uppercase characters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="563"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="550"/>
         <source>can %1 contain numeric characters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="566"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="553"/>
         <source>can contain the following punctuation: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="570"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="557"/>
         <source>first character can %1 be a punctuation mark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="577"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="564"/>
         <source>no unacceptable language as specified by these server rules:</source>
         <comment>note that the following lines will not be translated</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="583"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="570"/>
         <source>can not contain any of the following words: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="589"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="576"/>
         <source>can not match any of the following expressions: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="596"/>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="583"/>
         <source>You may only use A-Z, a-z, 0-9, _, ., and - in your username.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1960,7 +1548,7 @@ To update your client, go to Help -&gt; Check for Updates.</source>
 <context>
     <name>DeckEditorCardDatabaseDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="74"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="46"/>
         <source>Card Database</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1976,17 +1564,17 @@ To update your client, go to Help -&gt; Check for Updates.</source>
 <context>
     <name>DeckEditorDatabaseDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="30"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="28"/>
         <source>Search by card name (or search expressions)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="140"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="127"/>
         <source>Add card to &amp;maindeck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="141"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="128"/>
         <source>Add card to &amp;sideboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1994,158 +1582,97 @@ To update your client, go to Help -&gt; Check for Updates.</source>
 <context>
     <name>DeckEditorDeckDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="143"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="131"/>
         <source>Loading Database...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="167"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="153"/>
         <source>Banner Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="189"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="175"/>
         <source>Main Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="190"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="176"/>
         <source>Mana Cost</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="191"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="177"/>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="240"/>
-        <source>Playmat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="241"/>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="483"/>
-        <source>Edit Playmat...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="485"/>
-        <source>Edit Playmat (%1)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="814"/>
-        <source>&amp;Rename zone...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="826"/>
-        <source>Change &amp;board</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="829"/>
-        <source>&amp;Delete zone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="833"/>
-        <source>Move or remove all cards first.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="838"/>
-        <source>Delete zone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="838"/>
-        <source>Delete the zone &quot;%1&quot;?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="860"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="721"/>
         <source>Select Printing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="896"/>
-        <source>Move to &amp;zone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="919"/>
-        <source>Create new zone and move &amp;here...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="973"/>
-        <source>Create &amp;new zone...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="1001"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="737"/>
         <source>Deck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="1003"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="739"/>
         <source>Deck &amp;name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="1004"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="740"/>
         <source>Banner Card/Tags Visibility Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="1005"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="741"/>
         <source>Show banner card selection menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="1006"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="742"/>
         <source>Show tags selection menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="1007"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="743"/>
         <source>&amp;Comments:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="1008"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="744"/>
         <source>Group by:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="1009"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="745"/>
         <source>Format:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="1012"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="747"/>
         <source>Hash:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="1014"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="749"/>
         <source>&amp;Increment number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="1015"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="750"/>
         <source>&amp;Decrement number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="1016"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="751"/>
         <source>&amp;Remove row</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="1017"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="752"/>
         <source>Swap card to/from sideboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2153,17 +1680,17 @@ To update your client, go to Help -&gt; Check for Updates.</source>
 <context>
     <name>DeckEditorFilterDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="141"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="139"/>
         <source>Filters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="143"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="141"/>
         <source>&amp;Clear all filters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="144"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="142"/>
         <source>Delete selected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2171,119 +1698,114 @@ To update your client, go to Help -&gt; Check for Updates.</source>
 <context>
     <name>DeckEditorMenu</name>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="158"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="152"/>
         <source>&amp;Deck Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="159"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="153"/>
         <source>&amp;New deck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="160"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="154"/>
         <source>&amp;Load deck...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="161"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="155"/>
         <source>Load recent deck...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="162"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="156"/>
         <source>Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="163"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="157"/>
         <source>&amp;Save deck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="164"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="158"/>
         <source>Save deck &amp;as...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="165"/>
-        <source>Share deck...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="167"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="160"/>
         <source>Load deck from cl&amp;ipboard...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="169"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="162"/>
         <source>Edit deck in clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="170"/>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="174"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="163"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="167"/>
         <source>Annotated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="171"/>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="176"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="164"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="169"/>
         <source>Not Annotated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="173"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="166"/>
         <source>Save deck to clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="175"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="168"/>
         <source>Annotated (No set info)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="177"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="170"/>
         <source>Not Annotated (No set info)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="179"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="172"/>
         <source>&amp;Print deck...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="181"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="174"/>
         <source>Load deck from online service...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="182"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="175"/>
         <source>&amp;Send deck to online service</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="183"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="176"/>
         <source>Create decklist (decklist.org)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="184"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="177"/>
         <source>Create decklist (decklist.xyz)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="185"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="178"/>
         <source>Analyze deck (deckstats.net)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="186"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="179"/>
         <source>Analyze deck (tappedout.net)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="188"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="181"/>
         <source>&amp;Close</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2291,7 +1813,7 @@ To update your client, go to Help -&gt; Check for Updates.</source>
 <context>
     <name>DeckEditorPrintingSelectorDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="51"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="49"/>
         <source>Printing Selector</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2299,152 +1821,110 @@ To update your client, go to Help -&gt; Check for Updates.</source>
 <context>
     <name>DeckEditorSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="323"/>
-        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="379"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="181"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="237"/>
         <source>Update Spoilers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="132"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="115"/>
         <source>Success</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="132"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="115"/>
         <source>Download URLs have been reset.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="138"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="121"/>
         <source>Add URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="138"/>
-        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="159"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="121"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="141"/>
         <source>URL:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="159"/>
-        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="381"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="141"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="239"/>
         <source>Edit URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="380"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="238"/>
         <source>Add New URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="382"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="240"/>
         <source>Remove URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="312"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="170"/>
         <source>Updating...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="235"/>
-        <source>%1  (unlimited)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="241"/>
-        <source>%1  (%2/s)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="255"/>
-        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="261"/>
-        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="383"/>
-        <source>Adjust Rate Limit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="255"/>
-        <source>Select a URL in the list first.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="261"/>
-        <source>The selected URL does not have a valid host.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="279"/>
-        <source>Requests per second (0 = unlimited, fastest; up to %1):</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="284"/>
-        <source>Requests per second (developer maximum is %1):</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="287"/>
-        <source>Adjust Rate Limit for %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="342"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="200"/>
         <source>Choose path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="368"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="226"/>
         <source>URL Download Priority</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="369"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="227"/>
         <source>Spoilers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="370"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="228"/>
         <source>Download Spoilers Automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="371"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="229"/>
         <source>Spoiler Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="372"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="230"/>
         <source>Last Change</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="373"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="231"/>
         <source>Spoilers download automatically on launch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="374"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="232"/>
         <source>Press the button to manually update without relaunching</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="375"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="233"/>
         <source>Do not close settings until manual update is complete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="376"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="234"/>
         <source>Download card pictures on the fly</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="377"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="235"/>
         <source>How to add a custom URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="378"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="236"/>
         <source>Reset Download URLs</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2452,32 +1932,32 @@ To update your client, go to Help -&gt; Check for Updates.</source>
 <context>
     <name>DeckListHistoryManagerWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
         <source>Undo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
         <source>Redo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="59"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
         <source>Undo/Redo history</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="60"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="59"/>
         <source>Click on an entry to revert to that point in the history.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="72"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="71"/>
         <source>[redo] </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="89"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="88"/>
         <source>[undo] </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2485,27 +1965,27 @@ To update your client, go to Help -&gt; Check for Updates.</source>
 <context>
     <name>DeckListModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="247"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
         <source>Count</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="251"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
         <source>Set</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="253"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
         <source>Number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="255"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="219"/>
         <source>Provider ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="249"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="213"/>
         <source>Card</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2526,22 +2006,17 @@ To update your client, go to Help -&gt; Check for Updates.</source>
 <context>
     <name>DeckPreviewColorIdentityFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="44"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="48"/>
         <source>Mode: Exact Match</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="47"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="48"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="50"/>
-        <source>Mode: Excludes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="53"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
         <source>Color identity filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2549,7 +2024,7 @@ To update your client, go to Help -&gt; Check for Updates.</source>
 <context>
     <name>DeckPreviewDeckTagsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="47"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="49"/>
         <source>Edit tags ...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2557,62 +2032,62 @@ To update your client, go to Help -&gt; Check for Updates.</source>
 <context>
     <name>DeckPreviewTagDialog</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="103"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="101"/>
         <source>Deck Tags Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="104"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="102"/>
         <source>Manage your deck tags. Check or uncheck tags as needed, or add new ones:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="105"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="103"/>
         <source>Add a new tag (e.g., Aggro️)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="106"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="104"/>
         <source>Add Tag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="107"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="105"/>
         <source>Filter tags...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="108"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="106"/>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="109"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="107"/>
         <source>Edit default tags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="110"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="108"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="143"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="141"/>
         <source>Invalid Input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="143"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="141"/>
         <source>Tag name cannot be empty!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="152"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="150"/>
         <source>Duplicate Tag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="152"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="150"/>
         <source>This tag already exists.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2620,109 +2095,94 @@ To update your client, go to Help -&gt; Check for Updates.</source>
 <context>
     <name>DeckPreviewWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="118"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="59"/>
         <source>Banner Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="441"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="395"/>
         <source>Open in deck editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="447"/>
-        <source>Share deck...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="450"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="398"/>
         <source>Edit Tags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="457"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="405"/>
         <source>Rename Deck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="459"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="407"/>
         <source>Save Deck to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="461"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="409"/>
         <source>Annotated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="466"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="411"/>
         <source>Annotated (No set info)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="471"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
         <source>Not Annotated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="476"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="415"/>
         <source>Not Annotated (No set info)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="484"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="420"/>
         <source>Rename File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="486"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="422"/>
         <source>Delete File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="501"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
         <source>Set Banner Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="524"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="547"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="455"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="475"/>
         <source>New name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="524"/>
-        <source>Rename deck</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="547"/>
-        <source>Rename file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="554"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="576"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="488"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="511"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="554"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="488"/>
         <source>Rename failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="568"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="503"/>
         <source>Delete file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="568"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="503"/>
         <source>Are you sure you want to delete the selected file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="576"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="511"/>
         <source>Delete failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2730,102 +2190,57 @@ To update your client, go to Help -&gt; Check for Updates.</source>
 <context>
     <name>DeckStateManager</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="121"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="113"/>
         <source>Rename deck to &quot;%1&quot; from &quot;%2&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="134"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="126"/>
         <source>Updated comments (was %1 chars, now %2 chars)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="147"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="139"/>
         <source>Set banner card to %1 (%2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="160"/>
-        <source>Set playmat to %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="173"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="152"/>
         <source>Tags changed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="185"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="164"/>
         <source>Set format to %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="203"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="182"/>
         <source>Added (%1): %2 (%3) %4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="288"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="264"/>
         <source>Moved to %1 1 × &quot;%2&quot; (%3)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="305"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="282"/>
         <source>Removed &quot;%1&quot; (all copies)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="361"/>
-        <source>Moved %1 × &quot;%2&quot; (%3) to %4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="394"/>
-        <source>Created zone &quot;%1&quot; in %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="408"/>
-        <source>Renamed zone &quot;%1&quot; to &quot;%2&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="442"/>
-        <source>Moved zone &quot;%1&quot; to %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="451"/>
-        <source>Deleted zone &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="459"/>
-        <source>Enter a zone name.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="467"/>
-        <source>This name is reserved.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="478"/>
-        <source>A zone with this name already exists.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="493"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="306"/>
         <source>%1 1 × &quot;%2&quot; (%3)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="494"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="307"/>
         <source>Added</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="494"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="307"/>
         <source>Removed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2847,122 +2262,94 @@ To update your client, go to Help -&gt; Check for Updates.</source>
 <context>
     <name>DeckViewContainer</name>
     <message>
-        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="132"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="123"/>
         <source>Load deck...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="133"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="124"/>
         <source>Load remote deck...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="134"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="125"/>
         <source>Load from clipboard...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="135"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="126"/>
         <source>Load from website...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="136"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="127"/>
         <source>Unload deck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="137"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="128"/>
         <source>Ready to start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="138"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="129"/>
         <source>Force start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="206"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="197"/>
         <source>Sideboard unlocked</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="208"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="199"/>
         <source>Sideboard locked</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="278"/>
-        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="292"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="269"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="281"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="278"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="269"/>
         <source>The selected file could not be loaded.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="292"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="281"/>
         <source>Deck is greater than maximum file size.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="401"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="344"/>
         <source>Are you sure you want to force start?
 This will kick all non-ready players from the game.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="403"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="346"/>
         <source>Cockatrice</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>DeckZoneDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_zone_dialog.cpp" line="94"/>
-        <source>New zone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_zone_dialog.cpp" line="94"/>
-        <source>Rename zone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_zone_dialog.cpp" line="96"/>
-        <source>Zone &amp;name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_zone_dialog.cpp" line="99"/>
-        <source>&amp;Parent zone:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_zone_dialog.cpp" line="112"/>
-        <source>Enter a zone name.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>DialogConvertDeckToCodFormat</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="38"/>
+        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="30"/>
         <source>Deck Format Conversion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="40"/>
+        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="32"/>
         <source>You tried to add a tag to a .txt format deck.
  Tags can only be added to .cod format decks.
  Do you want to convert the deck to the .cod format?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="34"/>
         <source>Remember and automatically apply choice in the future</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2975,143 +2362,143 @@ This will kick all non-ready players from the game.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="21"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="19"/>
         <source>Known Hosts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="26"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="24"/>
         <source>Delete the currently selected saved server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="34"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="32"/>
         <source>Refresh the server list with known public servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="45"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="43"/>
         <source>New Host</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="47"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="45"/>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="52"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="50"/>
         <source>&amp;Host:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="57"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="55"/>
         <source>&amp;Port:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="62"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="60"/>
         <source>Player &amp;name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="67"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="65"/>
         <source>P&amp;assword:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="73"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="71"/>
         <source>&amp;Save password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="75"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="73"/>
         <source>A&amp;uto connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="76"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="74"/>
         <source>Automatically connect to the most recent login when Cockatrice opens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="92"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="90"/>
         <source>If you have any trouble connecting or registering then contact the server staff for help!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="94"/>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="284"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="92"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="281"/>
         <source>Webpage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="104"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="102"/>
         <source>Reset Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="108"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="106"/>
         <source>Forgot password?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="111"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="109"/>
         <source>&amp;Connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="135"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="133"/>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="155"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="153"/>
         <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="158"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="156"/>
         <source>Server Contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="171"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="169"/>
         <source>Connect to Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="298"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="295"/>
         <source>Server URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="301"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="298"/>
         <source>Communication Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="306"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="303"/>
         <source>Unique Server Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="332"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="329"/>
         <source>Connection Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="332"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="329"/>
         <source>You need to name your new connection profile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="347"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="344"/>
         <source>Connect Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="347"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="344"/>
         <source>The player name can&apos;t be empty.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3119,122 +2506,122 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgCreateGame</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="24"/>
         <source>Re&amp;member settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="26"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="25"/>
         <source>&amp;Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="31"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="30"/>
         <source>P&amp;layers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="43"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="42"/>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="56"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="55"/>
         <source>Game type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="59"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="58"/>
         <source>&amp;Password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="64"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="63"/>
         <source>Only &amp;buddies can join</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="65"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="64"/>
         <source>Only &amp;registered users can join</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="79"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="78"/>
         <source>Joining restrictions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="82"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="81"/>
         <source>&amp;Spectators can watch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="85"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="84"/>
         <source>Spectators &amp;need a password to watch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="86"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="85"/>
         <source>Spectators can &amp;chat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="87"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="86"/>
         <source>Spectators can see &amp;hands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="88"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="87"/>
         <source>Create game as spectator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="95"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="94"/>
         <source>Spectators</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="98"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="97"/>
         <source>Starting life total:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="105"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="104"/>
         <source>Open decklists in lobby</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="107"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="106"/>
         <source>Create game as judge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="119"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="118"/>
         <source>Game setup options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="181"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="180"/>
         <source>&amp;Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="187"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="186"/>
         <source>Create game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="235"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="233"/>
         <source>Game information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="325"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="323"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="325"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="323"/>
         <source>Server error.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3242,97 +2629,97 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgCreateToken</name>
     <message>
-        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="36"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="31"/>
         <source>&amp;Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="37"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="32"/>
         <source>Token</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="47"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="42"/>
         <source>C&amp;olor:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="49"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="44"/>
         <source>white</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="50"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="45"/>
         <source>blue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="51"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="46"/>
         <source>black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="52"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="47"/>
         <source>red</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="53"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="48"/>
         <source>green</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="54"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="49"/>
         <source>multicolor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="55"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="50"/>
         <source>colorless</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="58"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="53"/>
         <source>&amp;P/T:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="63"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="58"/>
         <source>&amp;Annotation:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="68"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="63"/>
         <source>&amp;Destroy token when it leaves the table</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="71"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="66"/>
         <source>Create face-down (Only hides name)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="86"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="81"/>
         <source>Token data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="104"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="88"/>
         <source>Show &amp;all tokens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="106"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="90"/>
         <source>Show tokens from this &amp;deck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="145"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="129"/>
         <source>Choose token from list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="163"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="147"/>
         <source>Create token</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3340,53 +2727,53 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgDefaultTagsEditor</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="48"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="47"/>
         <source>Edit Tags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="49"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="48"/>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="50"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="49"/>
         <source>Confirm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="51"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="50"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="52"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="51"/>
         <source>Enter a tag and press Enter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="72"/>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="121"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="71"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="120"/>
         <source>✖</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="92"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
         <source>Invalid Input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="92"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
         <source>Tag name cannot be empty!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="104"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="103"/>
         <source>Duplicate Tag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="104"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="103"/>
         <source>This tag already exists.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3395,7 +2782,7 @@ This will kick all non-ready players from the game.</source>
     <name>DlgEditAvatar</name>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="15"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="58"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="54"/>
         <source>No image chosen.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3406,32 +2793,27 @@ To remove your current avatar, confirm without choosing a new image.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="23"/>
-        <source>Images are automatically downscaled to at most %1x%1 pixels.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="22"/>
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="43"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="39"/>
         <source>Change avatar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="56"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
         <source>Open Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="56"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
         <source>Image Files (*.png *.jpg *.bmp)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="67"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="63"/>
         <source>Invalid image chosen.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3457,38 +2839,38 @@ To remove your current avatar, confirm without choosing a new image.</source>
 <context>
     <name>DlgEditPassword</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="15"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="14"/>
         <source>Old password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="27"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="26"/>
         <source>New password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="33"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="32"/>
         <source>Confirm new password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="56"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="55"/>
         <source>Change password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="65"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="68"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="64"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="67"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="65"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="64"/>
         <source>Your password is too short.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="68"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="67"/>
         <source>The new passwords don&apos;t match.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3496,93 +2878,93 @@ To remove your current avatar, confirm without choosing a new image.</source>
 <context>
     <name>DlgEditTokens</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="27"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="26"/>
         <source>&amp;Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="33"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="32"/>
         <source>C&amp;olor:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="35"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="34"/>
         <source>white</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="36"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="35"/>
         <source>blue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="37"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="36"/>
         <source>black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="38"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="37"/>
         <source>red</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="39"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="38"/>
         <source>green</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="40"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="39"/>
         <source>multicolor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="41"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="40"/>
         <source>colorless</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="45"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="44"/>
         <source>&amp;P/T:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="51"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="50"/>
         <source>&amp;Annotation:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="67"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="66"/>
         <source>Token data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="93"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="152"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="92"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="151"/>
         <source>Add token</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="96"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="95"/>
         <source>Remove token</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="121"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="120"/>
         <source>Edit custom tokens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="152"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="151"/>
         <source>Please enter the name of the token:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="157"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="156"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="158"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="157"/>
         <source>The chosen name conflicts with an existing card or token.
 Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dialog to display them correctly.</source>
         <translation type="unfinished"></translation>
@@ -3660,8 +3042,7 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
     </message>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="33"/>
-        <source>Hide started games</source>
-        <oldsource>Hide games that have started</oldsource>
+        <source>Hide games that have started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -3697,8 +3078,7 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
     </message>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="62"/>
-        <source>&amp;Host name:</source>
-        <oldsource>&amp;Creator name:</oldsource>
+        <source>&amp;Creator name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -3765,52 +3145,52 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgForgotPasswordChallenge</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="30"/>
+        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="29"/>
         <source>Reset Password Challenge Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="31"/>
+        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="30"/>
         <source>A problem has occurred. Please try to request a new password again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="36"/>
+        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="35"/>
         <source>Enter the information of the server and the account you&apos;d like to request a new password for.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="39"/>
+        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="38"/>
         <source>&amp;Host:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="44"/>
+        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="43"/>
         <source>&amp;Port:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="49"/>
+        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="48"/>
         <source>Player &amp;name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="54"/>
+        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="53"/>
         <source>Email:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="88"/>
+        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="87"/>
         <source>Reset Password Challenge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="96"/>
+        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="95"/>
         <source>Reset Password Challenge Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="96"/>
+        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="95"/>
         <source>The email address can&apos;t be empty.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3818,37 +3198,37 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgForgotPasswordRequest</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="29"/>
+        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="28"/>
         <source>Enter the information of the server you&apos;d like to request a new password for.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="32"/>
+        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="31"/>
         <source>&amp;Host:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="37"/>
+        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="36"/>
         <source>&amp;Port:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="41"/>
         <source>Player &amp;name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="65"/>
+        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="64"/>
         <source>Reset Password Request</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="73"/>
+        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="72"/>
         <source>Reset Password Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="73"/>
+        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="72"/>
         <source>The player name can&apos;t be empty.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3856,127 +3236,94 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgForgotPasswordReset</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="30"/>
+        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="29"/>
         <source>Reset Password Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="31"/>
+        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="30"/>
         <source>A problem has occurred. Please try to request a new password again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="35"/>
+        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="34"/>
         <source>Enter the received token and the new password in order to set your new password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="38"/>
+        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="37"/>
         <source>&amp;Host:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="43"/>
+        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="42"/>
         <source>&amp;Port:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="48"/>
+        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="47"/>
         <source>Player &amp;name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="53"/>
+        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="52"/>
         <source>Token:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="58"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="64"/>
+        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="57"/>
+        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="63"/>
         <source>New Password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="103"/>
+        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="102"/>
         <source>Reset Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="111"/>
+        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="110"/>
         <source>The player name can&apos;t be empty.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="111"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="116"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="121"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="130"/>
+        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="110"/>
+        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="115"/>
+        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="120"/>
+        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="129"/>
         <source>Reset Password Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="116"/>
+        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="115"/>
         <source>The token can&apos;t be empty.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="121"/>
+        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="120"/>
         <source>The new password can&apos;t be empty.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="127"/>
+        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="126"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="127"/>
+        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="126"/>
         <source>Your password is too short.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="130"/>
+        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="129"/>
         <source>The passwords do not match.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>DlgInviteToGame</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_invite_to_game.cpp" line="100"/>
-        <source>Join my game (#%1):</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_invite_to_game.cpp" line="101"/>
-        <source>Join my game &quot;%1&quot; (#%2):</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_invite_to_game.cpp" line="108"/>
-        <source>Invite to Game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_invite_to_game.cpp" line="109"/>
-        <source>Search users...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_invite_to_game.cpp" line="110"/>
-        <source>Invite</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_invite_to_game.cpp" line="111"/>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>DlgLoadDeck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck.cpp" line="8"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck.cpp" line="6"/>
         <source>Load Deck</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4060,566 +3407,165 @@ https://tappedout.net/mtg-decks/your-deck-name/</source>
 <context>
     <name>DlgLocalGameOptions</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="16"/>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="15"/>
         <source>Players:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="27"/>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="26"/>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="30"/>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="29"/>
         <source>Starting life total:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="41"/>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="40"/>
         <source>Game setup options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="44"/>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="43"/>
         <source>Remember settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="63"/>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="62"/>
         <source>Local game options</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>DlgLoginPrompt</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_login_prompt.cpp" line="12"/>
-        <source>Sign in</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_login_prompt.cpp" line="16"/>
-        <source>This link requires you to be signed in.
-Sign in to %1:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_login_prompt.cpp" line="22"/>
-        <source>Username:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_login_prompt.cpp" line="23"/>
-        <source>Password:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_login_prompt.cpp" line="26"/>
-        <source>Save password for this server</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>DlgMoveTopCardsUntil</name>
     <message>
-        <location filename="src/game_graphics/dialogs/dlg_move_top_cards_until.cpp" line="18"/>
+        <location filename="src/game_graphics/dialogs/dlg_move_top_cards_until.cpp" line="17"/>
         <source>Card name (or search expressions):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/dialogs/dlg_move_top_cards_until.cpp" line="28"/>
+        <location filename="src/game_graphics/dialogs/dlg_move_top_cards_until.cpp" line="26"/>
         <source>Number of hits:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/dialogs/dlg_move_top_cards_until.cpp" line="38"/>
+        <location filename="src/game_graphics/dialogs/dlg_move_top_cards_until.cpp" line="36"/>
         <source>Auto play hits</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/dialogs/dlg_move_top_cards_until.cpp" line="53"/>
+        <location filename="src/game_graphics/dialogs/dlg_move_top_cards_until.cpp" line="51"/>
         <source>Put top cards on stack until...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/dialogs/dlg_move_top_cards_until.cpp" line="84"/>
+        <location filename="src/game_graphics/dialogs/dlg_move_top_cards_until.cpp" line="82"/>
         <source>No cards matching the search expression exists in the card database. Proceed anyways?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/dialogs/dlg_move_top_cards_until.cpp" line="86"/>
+        <location filename="src/game_graphics/dialogs/dlg_move_top_cards_until.cpp" line="84"/>
         <source>Cockatrice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/dialogs/dlg_move_top_cards_until.cpp" line="98"/>
+        <location filename="src/game_graphics/dialogs/dlg_move_top_cards_until.cpp" line="96"/>
         <source>Invalid filter</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>DlgMyReports</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_my_reports.cpp" line="39"/>
-        <source>My Reports</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_my_reports.cpp" line="44"/>
-        <source>#</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_my_reports.cpp" line="44"/>
-        <source>Time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_my_reports.cpp" line="44"/>
-        <source>Reported User</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_my_reports.cpp" line="44"/>
-        <source>Category</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_my_reports.cpp" line="44"/>
-        <source>Game ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_my_reports.cpp" line="44"/>
-        <source>Status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_my_reports.cpp" line="44"/>
-        <source>Assigned To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_my_reports.cpp" line="55"/>
-        <source>Report Details</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_my_reports.cpp" line="60"/>
-        <source>Chat Log Context</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_my_reports.cpp" line="74"/>
-        <source>Comments:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_my_reports.cpp" line="79"/>
-        <source>Add a comment:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_my_reports.cpp" line="81"/>
-        <location filename="src/interface/widgets/dialogs/dlg_my_reports.cpp" line="230"/>
-        <source>Type your comment here...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_my_reports.cpp" line="82"/>
-        <source>Send</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_my_reports.cpp" line="99"/>
-        <source>Close</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_my_reports.cpp" line="102"/>
-        <source>Refresh</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_my_reports.cpp" line="126"/>
-        <location filename="src/interface/widgets/dialogs/dlg_my_reports.cpp" line="213"/>
-        <location filename="src/interface/widgets/dialogs/dlg_my_reports.cpp" line="214"/>
-        <source>Loading...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_my_reports.cpp" line="149"/>
-        <source>Failed to load reports.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_my_reports.cpp" line="187"/>
-        <source>%1 report(s)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_my_reports.cpp" line="228"/>
-        <source>This report is closed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_my_reports.cpp" line="241"/>
-        <source>Failed to load report details.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_my_reports.cpp" line="257"/>
-        <source>No comments yet.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_my_reports.cpp" line="257"/>
-        <source>[Moderator]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_my_reports.cpp" line="258"/>
-        <source>[You]</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>DlgRegister</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="24"/>
-        <source>Known Hosts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="29"/>
-        <source>Delete the currently selected saved server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="37"/>
-        <source>Refresh the server list with known public servers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="45"/>
-        <source>New Host</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="57"/>
-        <source>Server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="62"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="16"/>
         <source>Enter your information and the information of the server you&apos;d like to register to.
 Your email will be used to verify your account.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="66"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="20"/>
         <source>&amp;Host:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="71"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="25"/>
         <source>&amp;Port:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="76"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="30"/>
         <source>Player &amp;name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="81"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="35"/>
         <source>P&amp;assword:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="87"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="41"/>
         <source>Password (again):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="93"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="47"/>
         <source>Email:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="98"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="52"/>
         <source>Email (again):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="103"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="57"/>
         <source>Country:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="106"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="60"/>
         <source>Undefined</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="364"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="318"/>
         <source>Real name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="401"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="353"/>
         <source>Register to server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="478"/>
-        <source>Server URL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="481"/>
-        <source>Communication Port</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="512"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="515"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="518"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="523"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="362"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="365"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="368"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="373"/>
         <source>Registration Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="512"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="362"/>
         <source>Your password is too short.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="515"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="365"/>
         <source>Your passwords do not match, please try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="519"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="369"/>
         <source>Your email addresses do not match, please try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="523"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="373"/>
         <source>The player name can&apos;t be empty.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.h" line="78"/>
-        <source>Downloading...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DlgReportUser</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_report_user.cpp" line="27"/>
-        <source>Report User</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_report_user.cpp" line="31"/>
-        <source>Reports are reviewed by moderators. False reports may result in account penalties.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_report_user.cpp" line="35"/>
-        <source>Report Details</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_report_user.cpp" line="38"/>
-        <source>Reported User:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_report_user.cpp" line="43"/>
-        <source>Game ID:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_report_user.cpp" line="50"/>
-        <source>(Optional) Enter game ID if available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_report_user.cpp" line="51"/>
-        <source>If the report is related to a specific game, enter its ID.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_report_user.cpp" line="56"/>
-        <source>Category</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_report_user.cpp" line="69"/>
-        <source>Category:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_report_user.cpp" line="72"/>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_report_user.cpp" line="77"/>
-        <source>Please describe what happened. Include dates, game details, or any evidence if available.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_report_user.cpp" line="81"/>
-        <source>Chat Log Context</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_report_user.cpp" line="95"/>
-        <source>No chat context available (not triggered from chat).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_report_user.cpp" line="101"/>
-        <source>This chat log is captured from your local chat window and may not reflect the full conversation.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_report_user.cpp" line="107"/>
-        <location filename="src/interface/widgets/dialogs/dlg_report_user.cpp" line="168"/>
-        <source>Submit Report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_report_user.cpp" line="124"/>
-        <source>Missing description</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_report_user.cpp" line="124"/>
-        <source>Please describe what happened before submitting.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_report_user.cpp" line="129"/>
-        <source>Confirm Report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_report_user.cpp" line="130"/>
-        <source>Submit report against %1 for %2?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_report_user.cpp" line="138"/>
-        <source>Submitting...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_report_user.cpp" line="171"/>
-        <source>Report Submitted</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_report_user.cpp" line="172"/>
-        <source>Your report has been submitted and will be reviewed by a moderator. Thank you.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_report_user.cpp" line="175"/>
-        <location filename="src/interface/widgets/dialogs/dlg_report_user.cpp" line="179"/>
-        <location filename="src/interface/widgets/dialogs/dlg_report_user.cpp" line="182"/>
-        <source>Submission Failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_report_user.cpp" line="176"/>
-        <source>You have reached the daily report limit. Please try again later.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_report_user.cpp" line="180"/>
-        <source>The reported user could not be found. Guests (unregistered users) cannot be reported.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_report_user.cpp" line="182"/>
-        <source>Failed to submit report. Please try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_report_user.cpp" line="189"/>
-        <source>Cheating / Unsporting behavior</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_report_user.cpp" line="192"/>
-        <source>Bug Abuse</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_report_user.cpp" line="195"/>
-        <source>Harassment / Abuse</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_report_user.cpp" line="198"/>
-        <source>Verbal Abuse</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_report_user.cpp" line="201"/>
-        <source>Hate speech</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_report_user.cpp" line="204"/>
-        <source>Spam</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_report_user.cpp" line="207"/>
-        <source>Other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_report_user.cpp" line="215"/>
-        <source>Using external tools, cheat programs, or exploiting game bugs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_report_user.cpp" line="218"/>
-        <source>Exploiting a bug or glitch to gain an unfair advantage</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_report_user.cpp" line="221"/>
-        <source>Threatening, bullying, or persistent unwanted contact</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_report_user.cpp" line="224"/>
-        <source>Abusive or offensive language directed at another player</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_report_user.cpp" line="227"/>
-        <source>Discriminatory language targeting race, gender, religion, etc.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_report_user.cpp" line="230"/>
-        <source>Repeated unwanted messages or advertisements</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_report_user.cpp" line="233"/>
-        <source>Any behavior not covered by the above categories</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>DlgRollDice</name>
@@ -4685,12 +3631,34 @@ Your email will be used to verify your account.</source>
 <context>
     <name>DlgSettings</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="476"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="159"/>
         <source>Unknown Error loading card database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="496"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="167"/>
+        <source>Your card database is invalid.
+
+Cockatrice may not function correctly with an invalid database
+
+You may need to rerun oracle to update your card database.
+
+Would you like to change your database location setting?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="173"/>
+        <source>Your card database version is too old.
+
+This can cause problems loading card information or images
+
+Usually this can be fixed by rerunning oracle to to update your card database.
+
+Would you like to change your database location setting?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="179"/>
         <source>Your card database did not finish loading
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues with your cards.xml attached
@@ -4699,21 +3667,21 @@ Would you like to change your database location setting?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="502"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="185"/>
         <source>File Error loading your card database.
 
 Would you like to change your database location setting?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="506"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="189"/>
         <source>Your card database was loaded but contains no cards.
 
 Would you like to change your database location setting?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="510"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="193"/>
         <source>Unknown card database load status
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues
@@ -4722,235 +3690,104 @@ Would you like to change your database location setting?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="518"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="528"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="538"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="201"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="211"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="221"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="529"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="212"/>
         <source>The path to your deck directory is invalid. Would you like to go back and set the correct path?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="539"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="222"/>
         <source>The path to your card pictures directory is invalid. Would you like to go back and set the correct path?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="551"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="234"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="554"/>
-        <source>Search settings...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="555"/>
-        <source>OK</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="563"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="236"/>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="563"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="237"/>
         <source>Appearance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="563"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="238"/>
         <source>User Interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="564"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="239"/>
         <source>Storage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="563"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="240"/>
         <source>Card Sources</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="484"/>
-        <source>Your card database is invalid.
-
-Cockatrice may not function correctly with an invalid database
-
-You may need to rerun Oracle to update your card database.
-
-Would you like to change your database location setting?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="490"/>
-        <source>Your card database version is too old.
-
-This can cause problems loading card information or images
-
-Usually this can be fixed by rerunning Oracle to to update your card database.
-
-Would you like to change your database location setting?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="564"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="241"/>
         <source>Chat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="564"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="242"/>
         <source>Sound</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="564"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="243"/>
         <source>Shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>DlgShareDeck</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_share_deck.cpp" line="26"/>
-        <location filename="src/interface/widgets/dialogs/dlg_share_deck.cpp" line="77"/>
-        <location filename="src/interface/widgets/dialogs/dlg_share_deck.cpp" line="85"/>
-        <location filename="src/interface/widgets/dialogs/dlg_share_deck.cpp" line="95"/>
-        <source>Share deck</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_share_deck.cpp" line="31"/>
-        <location filename="src/interface/widgets/dialogs/dlg_share_deck.cpp" line="59"/>
-        <source>Shared deck</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_share_deck.cpp" line="34"/>
-        <source>Share name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_share_deck.cpp" line="38"/>
-        <source>Create share link</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_share_deck.cpp" line="39"/>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_share_deck.cpp" line="78"/>
-        <source>Failed to create the share link (server response code %1).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_share_deck.cpp" line="86"/>
-        <source>Share link created and copied to the clipboard:
-
-%1
-
-The share expires on %2.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_share_deck.cpp" line="95"/>
-        <source>The server did not respond in time. Try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DlgSharedDecksPreview</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_shared_decks_preview.cpp" line="23"/>
-        <source>Open shared decks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_shared_decks_preview.cpp" line="31"/>
-        <source>Share: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_shared_decks_preview.cpp" line="31"/>
-        <source>Untitled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_shared_decks_preview.cpp" line="39"/>
-        <source>From %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_shared_decks_preview.cpp" line="44"/>
-        <source>This share link expires on %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_shared_decks_preview.cpp" line="73"/>
-        <source>Open selected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_shared_decks_preview.cpp" line="74"/>
-        <source>Open all</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_shared_decks_preview.cpp" line="75"/>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_shared_decks_preview.cpp" line="161"/>
-        <source>Downloading deck %1 of %2: %3</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>DlgStartupCardCheck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="10"/>
+        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="9"/>
         <source>Card Update Check</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="18"/>
+        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="17"/>
         <source>It has been more than %2 days since you last checked your card database for updates.
 Choose how you would like to run the card database updater.
 You can always change this behavior in the &apos;General&apos; settings tab.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="26"/>
+        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="25"/>
         <source>Run in foreground</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="27"/>
+        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="26"/>
         <source>Run in background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="28"/>
+        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="27"/>
         <source>Run in background and always from now on</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="29"/>
+        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="28"/>
         <source>Don&apos;t prompt again and don&apos;t run</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="30"/>
+        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="29"/>
         <source>Don&apos;t run this time</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4958,17 +3795,17 @@ You can always change this behavior in the &apos;General&apos; settings tab.</so
 <context>
     <name>DlgTipOfTheDay</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="66"/>
+        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="65"/>
         <source>Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="67"/>
+        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="66"/>
         <source>Previous</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="90"/>
+        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="89"/>
         <source>Tip of the Day</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4976,174 +3813,164 @@ You can always change this behavior in the &apos;General&apos; settings tab.</so
 <context>
     <name>DlgUpdate</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="35"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="25"/>
         <source>Current release channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="44"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="34"/>
         <source>Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="45"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="35"/>
         <source>Cancel Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="46"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="36"/>
         <source>Open Download Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="65"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="55"/>
         <source>Check for Client Updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="73"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="236"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="243"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="312"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="63"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="206"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="213"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="245"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="74"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="64"/>
         <source>Cockatrice was not built with SSL support, therefore you cannot download updates automatically! 
 Please visit the download page to update manually.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="100"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="90"/>
         <source>Downloading update: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="117"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="107"/>
         <source>Checking for updates...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="132"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="122"/>
         <source>Finished checking for updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="147"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="137"/>
         <source>No Update Available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="148"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="138"/>
         <source>Cockatrice is up to date!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="149"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="139"/>
         <source>You are already running the latest version available in the chosen release channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="150"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="140"/>
         <source>Current version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="151"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="141"/>
         <source>Selected release channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="160"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="174"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="150"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="162"/>
         <source>Update Available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="161"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="175"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="151"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="163"/>
         <source>A new version of Cockatrice is available!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="161"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="175"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="151"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="163"/>
         <source>New version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="162"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="176"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="152"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
         <source>Released</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="163"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="177"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="153"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="165"/>
         <source>Changelog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="154"/>
         <source>Do you want to update now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="179"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="167"/>
         <source>Unfortunately, the automatic updater failed to find a compatible download. 
 You may have to manually download the new version.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="182"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="170"/>
         <source>Please check the &lt;a href=&quot;%1&quot;&gt;releases page&lt;/a&gt; on our Github and download the build for your system.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="223"/>
-        <source>Update</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="224"/>
-        <source>The update installer is already running and waits about a minute for Cockatrice to close. Cockatrice is still busy, so save your work and close it before then. Otherwise the installer gives up and the update is cancelled.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="237"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="245"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="313"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="207"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="215"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="246"/>
         <source>Update Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="238"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="208"/>
         <source>An error occurred while checking for updates:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="246"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="216"/>
         <source>An error occurred while downloading an update:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="251"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="221"/>
         <source>Installing...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="314"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="247"/>
         <source>Cockatrice is unable to open the installer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="315"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="248"/>
         <source>Try to update manually by closing Cockatrice and running the installer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="316"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="249"/>
         <source>Download location</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5151,17 +3978,17 @@ You may have to manually download the new version.</source>
 <context>
     <name>DlgViewLog</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="28"/>
+        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="26"/>
         <source>Clear log when closing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="33"/>
+        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="31"/>
         <source>Copy to clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="45"/>
+        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="43"/>
         <source>Debug Log</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5399,7 +4226,7 @@ You may have to manually download the new version.</source>
 <context>
     <name>EdhrecCommanderResponseCommanderDetailsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="82"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="81"/>
         <source>Salt: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -5407,7 +4234,7 @@ You may have to manually download the new version.</source>
 <context>
     <name>FilterBuilder</name>
     <message>
-        <location filename="src/filters/filter_builder.cpp" line="31"/>
+        <location filename="src/filters/filter_builder.cpp" line="30"/>
         <source>Type your filter here</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5415,88 +4242,45 @@ You may have to manually download the new version.</source>
 <context>
     <name>FilterDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="68"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
         <source>Confirm Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="68"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
         <source>Are you sure you want to delete the filter &apos;%1&apos;?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="78"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
         <source>Delete Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="78"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
         <source>Failed to delete filter &apos;%1&apos;.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>FinishPage</name>
-    <message>
-        <location filename="src/interface/widgets/onboarding/pages/finish_page.cpp" line="22"/>
-        <source>You&apos;re All Set</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/onboarding/pages/finish_page.cpp" line="28"/>
-        <source>That&apos;s everything for now. Jump into Settings any time to change your mind about any of this.
-
-Have fun!</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>FirstRunWizard</name>
-    <message>
-        <location filename="src/interface/widgets/onboarding/first_run_wizard.cpp" line="151"/>
-        <source>Finish</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/onboarding/first_run_wizard.cpp" line="151"/>
-        <source>Next</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/onboarding/first_run_wizard.cpp" line="214"/>
-        <source>Welcome to Cockatrice</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/onboarding/first_run_wizard.cpp" line="215"/>
-        <source>Back</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/onboarding/first_run_wizard.cpp" line="216"/>
-        <source>Skip</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>GameEventHandler</name>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="455"/>
+        <location filename="src/game/game_event_handler.cpp" line="438"/>
         <source>kicked by game host or moderator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="458"/>
+        <location filename="src/game/game_event_handler.cpp" line="441"/>
         <source>player left the game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="461"/>
+        <location filename="src/game/game_event_handler.cpp" line="444"/>
         <source>player disconnected from server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="465"/>
+        <location filename="src/game/game_event_handler.cpp" line="448"/>
         <source>reason unknown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5504,156 +4288,140 @@ Have fun!</source>
 <context>
     <name>GameSelector</name>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="246"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="249"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="252"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="255"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="258"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="261"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="264"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="267"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="411"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="238"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="241"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="244"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="247"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="250"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="253"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="256"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="259"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="368"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="246"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="238"/>
         <source>Please join the appropriate room first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="249"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="241"/>
         <source>Wrong password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="252"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="244"/>
         <source>Spectators are not allowed in this game.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="255"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="247"/>
         <source>The game is already full.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="258"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="250"/>
         <source>The game does not exist any more.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="261"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="253"/>
         <source>This game is only open to registered users.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="264"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="256"/>
         <source>This game is only open to its creator&apos;s buddies.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="267"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="259"/>
         <source>You are being ignored by the creator of this game.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="308"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="300"/>
         <source>Join Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="311"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="303"/>
         <source>Spectate Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="314"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="306"/>
         <source>Game Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="323"/>
-        <source>Cop&amp;y game link</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="335"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="319"/>
         <source>Join Game as Judge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="340"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="324"/>
         <source>Spectate Game as Judge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="379"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="396"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="353"/>
         <source>Join game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="379"/>
-        <source>The game is full. Join as a spectator instead?</source>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="353"/>
+        <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="394"/>
-        <source>Password for game #%1:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="395"/>
-        <source>Password for &quot;%1&quot;:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="411"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="368"/>
         <source>Please join the respective room first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="473"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="414"/>
         <source>&amp;Filter games</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="474"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="415"/>
         <source>C&amp;lear filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="476"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="417"/>
         <source>C&amp;reate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="478"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="419"/>
         <source>&amp;Join</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="479"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="420"/>
         <source>Join as judge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="480"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="421"/>
         <source>J&amp;oin as spectator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="481"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="422"/>
         <source>Join as judge spectator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="502"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="443"/>
         <source>Games shown: %1 / %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="504"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="445"/>
         <source>Games</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5694,12 +4462,12 @@ Have fun!</source>
 <context>
     <name>GamesModel</name>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="49"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="34"/>
         <source>&gt;1 day</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="58"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="43"/>
         <source>%1%2 hr</source>
         <comment>short age in hours</comment>
         <translation type="unfinished">
@@ -5708,12 +4476,12 @@ Have fun!</source>
         </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="60"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="45"/>
         <source>new</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="63"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="48"/>
         <source>%1%2 min</source>
         <comment>short age in minutes</comment>
         <translation type="unfinished">
@@ -5722,83 +4490,83 @@ Have fun!</source>
         </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="164"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="149"/>
         <source>password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="167"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="152"/>
         <source>buddies only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="170"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="155"/>
         <source>reg. users only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="173"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="158"/>
         <source>open decklists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="206"/>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="211"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="191"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="196"/>
         <source>can chat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="208"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="193"/>
         <source>see hands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="213"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="198"/>
         <source>can see hands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="218"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="203"/>
         <source>not allowed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="237"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="222"/>
         <source>Room</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="241"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="226"/>
         <source>Age</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="249"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="234"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="251"/>
-        <source>Host</source>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="236"/>
+        <source>Creator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="253"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="238"/>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="255"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="240"/>
         <source>Restrictions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="259"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="244"/>
         <source>Players</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="267"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="252"/>
         <source>Spectators</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5806,275 +4574,158 @@ Have fun!</source>
 <context>
     <name>GeneralSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="587"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="390"/>
         <source>Reset all paths</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="280"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="183"/>
         <source>All paths have been reset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="57"/>
-        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="516"/>
-        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="521"/>
-        <source>English</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="355"/>
-        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="366"/>
-        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="377"/>
-        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="388"/>
-        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="399"/>
-        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="410"/>
-        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="421"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="261"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="272"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="283"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="294"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="305"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="316"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="327"/>
         <source>Choose path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="472"/>
-        <source>&lt;p&gt;The card database only contains English card data. To see cards in &lt;b&gt;%1&lt;/b&gt;, &lt;b&gt;Oracle&lt;/b&gt; must run once with this language selected and re-import the card database.&lt;/p&gt;&lt;p&gt;The cached database and the downloaded card pictures have been cleared, so a re-import is picked up without stale entries.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="479"/>
-        <source>&lt;p&gt;The Scryfall URL that resolves card art by translated name was added to the top of your download list. You can remove or reorder it any time.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="482"/>
-        <source>&lt;p&gt;Run Oracle now?&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="485"/>
-        <source>Card text &amp; images language changed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="514"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="356"/>
         <source>Language settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="515"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="357"/>
         <source>Language:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="517"/>
-        <source>Card text &amp; images language:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="519"/>
-        <source>Foreign card names, text and art apply after you update the card database (Oracle).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="520"/>
-        <source>Language used in card search:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="523"/>
-        <source>Selected card language (untranslated cards still match in English)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="525"/>
-        <source>English and selected card language</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="529"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="359"/>
         <source>Version settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="543"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="360"/>
         <source>Card database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="558"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="361"/>
         <source>Startup settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="560"/>
-        <source>Startup tab:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="561"/>
-        <source>Home</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="562"/>
-        <source>Visual Deck Storage</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="563"/>
-        <source>Deck Storage</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="564"/>
-        <source>Game Replays</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="565"/>
-        <source>Deck Editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="566"/>
-        <source>Visual Deck Editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="567"/>
-        <source>Server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="568"/>
-        <source>Server Room</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="570"/>
-        <source>The tab shown when Cockatrice starts. If the chosen tab is not open yet, it is opened.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="571"/>
-        <source>Server:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="572"/>
-        <source>Room:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="573"/>
-        <source>Room name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="576"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="364"/>
         <source>Paths (editing disabled in portable mode)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="578"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="366"/>
         <source>Paths</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="527"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="369"/>
         <source>How to help with translations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="580"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="370"/>
         <source>Decks directory:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="581"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="371"/>
         <source>Filters directory:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="582"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="372"/>
         <source>Replays directory:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="583"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="373"/>
         <source>Pictures directory:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="584"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="374"/>
         <source>Card database:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="585"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="375"/>
         <source>Custom database directory:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="586"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="376"/>
         <source>Token database:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="530"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="377"/>
         <source>Update channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="531"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="378"/>
         <source>Check for client updates on startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="544"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="379"/>
         <source>Check for card database updates on startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="545"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="380"/>
         <source>Don&apos;t check</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="547"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="382"/>
         <source>Prompt for update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="549"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="384"/>
         <source>Always update in the background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="550"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="385"/>
         <source>Check for card database updates every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="551"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="386"/>
         <source> days</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="532"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="387"/>
         <source>Notify if a feature supported by the server is missing in my client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="533"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="388"/>
         <source>Automatically run Oracle when running a new version of Cockatrice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="559"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="389"/>
         <source>Show tips on startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="556"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="398"/>
         <source>Last update check on %1 (%2 days ago)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6082,47 +4733,47 @@ Have fun!</source>
 <context>
     <name>GraveyardMenu</name>
     <message>
-        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="101"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="100"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="103"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="102"/>
         <source>&amp;View graveyard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="106"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="105"/>
         <source>&amp;Move graveyard to...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="107"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="106"/>
         <source>&amp;Top of library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="108"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="107"/>
         <source>&amp;Bottom of library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="75"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="74"/>
         <source>&amp;All players</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="109"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="108"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="110"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="109"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="112"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="111"/>
         <source>Reveal random card to...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6216,359 +4867,59 @@ Have fun!</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>HomeTabButtonColor</name>
-    <message>
-        <location filename="src/interface/widgets/general/home_tab_button_color.h" line="26"/>
-        <source>From theme colors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_tab_button_color.h" line="27"/>
-        <source>Extract from background</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>HomeWidget</name>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="247"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="204"/>
         <source>Create New Deck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="251"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="208"/>
         <source>Browse Decks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="255"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="212"/>
         <source>Browse Card Database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="259"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="216"/>
         <source>Browse EDHRec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="262"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="219"/>
         <source>Browse Archidekt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="265"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="222"/>
         <source>View Replays</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="269"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="226"/>
         <source>Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="284"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="241"/>
         <source>Connecting...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="288"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="245"/>
         <source>Connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="294"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="251"/>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>IntentConnectToServer</name>
-    <message>
-        <location filename="src/interface/intents/intent_connect_to_server.cpp" line="27"/>
-        <source>Timed out while connecting to %1:%2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/intents/intent_connect_to_server.cpp" line="45"/>
-        <source>Failed to connect to %1:%2: %3</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>IntentGetLoginCredentials</name>
-    <message>
-        <location filename="src/interface/intents/intent_login.cpp" line="31"/>
-        <location filename="src/interface/intents/intent_login.cpp" line="41"/>
-        <source>No saved credentials for this server</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>IntentJoinServerGame</name>
-    <message>
-        <location filename="src/interface/intents/intent_join_server_game.cpp" line="77"/>
-        <source>Game %1 not found in the room</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>IntentJoinServerRoom</name>
-    <message>
-        <location filename="src/interface/intents/intent_join_server_room.cpp" line="50"/>
-        <source>No server tab available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/intents/intent_join_server_room.cpp" line="63"/>
-        <source>Failed to join the server room %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/intents/intent_join_server_room.cpp" line="68"/>
-        <source>Timed out while joining the server room %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>IntentOpenLocalDeck</name>
-    <message>
-        <location filename="src/interface/intents/intent_open_local_deck.cpp" line="27"/>
-        <source>Unable to load deck file %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>IntentOpenServerRoomByName</name>
-    <message>
-        <location filename="src/interface/intents/intent_open_server_room_by_name.cpp" line="62"/>
-        <source>No server tab available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/intents/intent_open_server_room_by_name.cpp" line="91"/>
-        <source>Timed out while looking for the server room %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/intents/intent_open_server_room_by_name.cpp" line="104"/>
-        <source>Disconnected while looking for the server room %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/intents/intent_open_server_room_by_name.cpp" line="170"/>
-        <source>Failed to join the server room %1: it doesn&apos;t exist on the server.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/intents/intent_open_server_room_by_name.cpp" line="173"/>
-        <source>You do not have the required permission to join the server room %1.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/intents/intent_open_server_room_by_name.cpp" line="180"/>
-        <source>Failed to join the server room %1 due to an unknown error.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>IntentOpenSharedDeck</name>
-    <message>
-        <location filename="src/interface/intents/intent_open_shared_deck.cpp" line="75"/>
-        <source>The shared deck could not be found or has expired</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/intents/intent_open_shared_deck.cpp" line="81"/>
-        <location filename="src/interface/intents/intent_open_shared_deck.cpp" line="145"/>
-        <source>The shared deck is empty</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/intents/intent_open_shared_deck.cpp" line="140"/>
-        <source>Failed to download the shared deck</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/intents/intent_open_shared_deck.cpp" line="150"/>
-        <source>The shared deck could not be loaded</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/intents/intent_open_shared_deck.cpp" line="155"/>
-        <location filename="src/interface/intents/intent_open_shared_deck.cpp" line="179"/>
-        <source>Unknown deck</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/intents/intent_open_shared_deck.cpp" line="177"/>
-        <source>Open shared decks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message numerus="yes">
-        <location filename="src/interface/intents/intent_open_shared_deck.cpp" line="178"/>
-        <source>Could not download the deck &quot;%1&quot;.
-
-%n deck(s) were already downloaded. Open them?</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
-    <message>
-        <location filename="src/interface/intents/intent_open_shared_deck.cpp" line="195"/>
-        <source>Timed out while loading the shared deck</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/intents/intent_open_shared_deck.cpp" line="198"/>
-        <source>Timed out while downloading the shared deck</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>IntentUrlParser</name>
-    <message>
-        <location filename="src/interface/intents/url_parser.cpp" line="69"/>
-        <source>Open game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/intents/url_parser.cpp" line="77"/>
-        <source>Missing or empty hostname in the game link</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/intents/url_parser.cpp" line="84"/>
-        <source>Invalid or missing port in the game link</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/intents/url_parser.cpp" line="91"/>
-        <source>Invalid or missing room id in the game link</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/intents/url_parser.cpp" line="99"/>
-        <source>Invalid or missing game id in the game link</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/intents/url_parser.cpp" line="107"/>
-        <source>Join game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/intents/url_parser.cpp" line="164"/>
-        <source>Join game #%1 in &quot;%2&quot; on %3?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/intents/url_parser.cpp" line="165"/>
-        <source>Join game #%1 on %2?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/intents/url_parser.cpp" line="168"/>
-        <source>Join game &quot;%1&quot; (#%2) in &quot;%3&quot; on %4?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/intents/url_parser.cpp" line="170"/>
-        <source>Join game &quot;%1&quot; (#%2) on %3?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/intents/url_parser.cpp" line="176"/>
-        <location filename="src/interface/intents/url_parser.cpp" line="223"/>
-        <location filename="src/interface/intents/url_parser.cpp" line="239"/>
-        <location filename="src/interface/intents/url_parser.cpp" line="241"/>
-        <source>Open shared deck</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/intents/url_parser.cpp" line="189"/>
-        <source>Missing or empty hostname in the share link</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/intents/url_parser.cpp" line="196"/>
-        <source>Invalid or missing port in the share link</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/intents/url_parser.cpp" line="201"/>
-        <source>Missing or empty share value in the share link</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/intents/url_parser.cpp" line="224"/>
-        <source>Opening this share link connects you to %1 instead of %2.
-
-Continue?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/intents/url_parser.cpp" line="240"/>
-        <source>Opening this share link connects you to %1.
-
-Continue?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/intents/url_parser.cpp" line="242"/>
-        <source>Opening this share link connects you to %1, a server you have never connected to before.
-
-Continue?</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>LatencyStatusWidget</name>
-    <message>
-        <location filename="src/client/latency_status_widget.cpp" line="18"/>
-        <source>Ping</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/client/latency_status_widget.cpp" line="53"/>
-        <source>Ping: %1 ms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/client/latency_status_widget.cpp" line="79"/>
-        <source>Connection latency details</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message numerus="yes">
-        <location filename="src/client/latency_status_widget.cpp" line="108"/>
-        <source>Connection quality over the last %n sample(s):</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
-    <message>
-        <location filename="src/client/latency_status_widget.cpp" line="109"/>
-        <source>Last: %1 ms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/client/latency_status_widget.cpp" line="109"/>
-        <source>Median: %1 ms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/client/latency_status_widget.cpp" line="110"/>
-        <source>95th percentile: %1 ms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/client/latency_status_widget.cpp" line="110"/>
-        <source>Maximum: %1 ms</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>LibraryMenu</name>
     <message>
@@ -6786,321 +5137,300 @@ Continue?</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="184"/>
-        <location filename="src/interface/window_main.cpp" line="191"/>
+        <location filename="src/interface/window_main.cpp" line="159"/>
+        <location filename="src/interface/window_main.cpp" line="166"/>
         <source>Player %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="204"/>
+        <location filename="src/interface/window_main.cpp" line="179"/>
         <source>Load replay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="263"/>
+        <location filename="src/interface/window_main.cpp" line="236"/>
         <source>About Cockatrice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="265"/>
+        <location filename="src/interface/window_main.cpp" line="238"/>
         <source>Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="266"/>
+        <location filename="src/interface/window_main.cpp" line="239"/>
         <source>Cockatrice Webpage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="266"/>
+        <location filename="src/interface/window_main.cpp" line="239"/>
         <source>Project Manager:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="267"/>
+        <location filename="src/interface/window_main.cpp" line="240"/>
         <source>Past Project Managers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="268"/>
+        <location filename="src/interface/window_main.cpp" line="241"/>
         <source>Developers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="269"/>
+        <location filename="src/interface/window_main.cpp" line="242"/>
         <source>Our Developers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="270"/>
+        <location filename="src/interface/window_main.cpp" line="243"/>
         <source>Help Develop!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="271"/>
+        <location filename="src/interface/window_main.cpp" line="244"/>
         <source>Translators:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="272"/>
+        <location filename="src/interface/window_main.cpp" line="245"/>
         <source>Our Translators</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="273"/>
+        <location filename="src/interface/window_main.cpp" line="246"/>
         <source>Help Translate!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="273"/>
+        <location filename="src/interface/window_main.cpp" line="246"/>
         <source>Support:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="274"/>
+        <location filename="src/interface/window_main.cpp" line="247"/>
         <source>Report an Issue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="275"/>
+        <location filename="src/interface/window_main.cpp" line="248"/>
         <source>Troubleshooting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="276"/>
+        <location filename="src/interface/window_main.cpp" line="249"/>
         <source>F.A.Q.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1154"/>
-        <location filename="src/interface/window_main.cpp" line="1244"/>
+        <location filename="src/interface/window_main.cpp" line="902"/>
+        <location filename="src/interface/window_main.cpp" line="954"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="323"/>
+        <location filename="src/interface/window_main.cpp" line="295"/>
         <source>&amp;Connect...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="324"/>
+        <location filename="src/interface/window_main.cpp" line="296"/>
         <source>&amp;Disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="325"/>
+        <location filename="src/interface/window_main.cpp" line="297"/>
         <source>Start &amp;local game...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="326"/>
+        <location filename="src/interface/window_main.cpp" line="298"/>
         <source>&amp;Watch replay...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="327"/>
+        <location filename="src/interface/window_main.cpp" line="299"/>
         <source>&amp;Full screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="328"/>
+        <location filename="src/interface/window_main.cpp" line="300"/>
         <source>&amp;Register to server...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="329"/>
+        <location filename="src/interface/window_main.cpp" line="301"/>
         <source>&amp;Restore password...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="330"/>
+        <location filename="src/interface/window_main.cpp" line="302"/>
         <source>&amp;Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="332"/>
+        <location filename="src/interface/window_main.cpp" line="304"/>
         <source>&amp;Exit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="335"/>
+        <location filename="src/interface/window_main.cpp" line="307"/>
         <source>A&amp;ctions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="337"/>
+        <location filename="src/interface/window_main.cpp" line="309"/>
         <source>&amp;Cockatrice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="340"/>
+        <location filename="src/interface/window_main.cpp" line="312"/>
         <source>C&amp;ard Database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="341"/>
+        <location filename="src/interface/window_main.cpp" line="313"/>
         <source>&amp;Manage sets...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="342"/>
+        <location filename="src/interface/window_main.cpp" line="314"/>
         <source>Edit custom &amp;tokens...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="343"/>
+        <location filename="src/interface/window_main.cpp" line="315"/>
         <source>Open custom image folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="344"/>
+        <location filename="src/interface/window_main.cpp" line="316"/>
         <source>Open custom sets folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="345"/>
+        <location filename="src/interface/window_main.cpp" line="317"/>
         <source>Add custom sets/cards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="346"/>
+        <location filename="src/interface/window_main.cpp" line="318"/>
         <source>Reload card database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="348"/>
+        <location filename="src/interface/window_main.cpp" line="320"/>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="350"/>
+        <location filename="src/interface/window_main.cpp" line="322"/>
         <source>&amp;Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="351"/>
+        <location filename="src/interface/window_main.cpp" line="323"/>
         <source>&amp;About Cockatrice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="352"/>
+        <location filename="src/interface/window_main.cpp" line="324"/>
         <source>&amp;Tip of the Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="353"/>
+        <location filename="src/interface/window_main.cpp" line="325"/>
         <source>Check for Client Updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="354"/>
+        <location filename="src/interface/window_main.cpp" line="326"/>
         <source>Check for Card Updates...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="355"/>
+        <location filename="src/interface/window_main.cpp" line="327"/>
         <source>Check for Card Updates (Automatic)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="356"/>
+        <location filename="src/interface/window_main.cpp" line="328"/>
         <source>Show Status Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="357"/>
+        <location filename="src/interface/window_main.cpp" line="329"/>
         <source>View &amp;Debug Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="358"/>
+        <location filename="src/interface/window_main.cpp" line="330"/>
         <source>Open Settings Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="359"/>
-        <source>Re-run Onboarding Wizard...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="361"/>
+        <location filename="src/interface/window_main.cpp" line="332"/>
         <source>Show/Hide</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="758"/>
-        <source>Sign-in cancelled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="805"/>
+        <location filename="src/interface/window_main.cpp" line="630"/>
         <source>New Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="806"/>
+        <location filename="src/interface/window_main.cpp" line="631"/>
         <source>Congratulations on updating to Cockatrice %1!
 Oracle will now launch to update your card database.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="810"/>
+        <location filename="src/interface/window_main.cpp" line="635"/>
         <source>Cockatrice installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="811"/>
+        <location filename="src/interface/window_main.cpp" line="636"/>
         <source>Congratulations on installing Cockatrice %1!
 Oracle will now launch to install the initial card database.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="880"/>
-        <source>Are you sure?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="881"/>
-        <source>A card database update is still running. Quitting now will cancel it.
-Are you sure you want to quit?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="1007"/>
+        <location filename="src/interface/window_main.cpp" line="761"/>
         <source>Card database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1009"/>
+        <location filename="src/interface/window_main.cpp" line="763"/>
         <source>Cockatrice is unable to load the card database.
 Do you want to update your card database now?
 If unsure or first time user, choose &quot;Yes&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1013"/>
-        <location filename="src/interface/window_main.cpp" line="1045"/>
+        <location filename="src/interface/window_main.cpp" line="767"/>
+        <location filename="src/interface/window_main.cpp" line="799"/>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1014"/>
-        <location filename="src/interface/window_main.cpp" line="1047"/>
+        <location filename="src/interface/window_main.cpp" line="768"/>
+        <location filename="src/interface/window_main.cpp" line="801"/>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1015"/>
+        <location filename="src/interface/window_main.cpp" line="769"/>
         <source>Open settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1037"/>
+        <location filename="src/interface/window_main.cpp" line="791"/>
         <source>New sets found</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="1039"/>
+        <location filename="src/interface/window_main.cpp" line="793"/>
         <source>%n new set(s) found in the card database
 Set code(s): %1
 Do you want to enable it/them?</source>
@@ -7110,110 +5440,110 @@ Do you want to enable it/them?</source>
         </translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1046"/>
+        <location filename="src/interface/window_main.cpp" line="800"/>
         <source>Yes, always enable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1048"/>
+        <location filename="src/interface/window_main.cpp" line="802"/>
         <source>View sets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1079"/>
+        <location filename="src/interface/window_main.cpp" line="827"/>
         <source>Welcome</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1080"/>
+        <location filename="src/interface/window_main.cpp" line="828"/>
         <source>Hi! It seems like you&apos;re running this version of Cockatrice for the first time.
 All the sets in the card database have been enabled.
 Read more about changing the set order or disabling specific sets and consequent effects in the &quot;Manage Sets&quot; dialog.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1100"/>
+        <location filename="src/interface/window_main.cpp" line="848"/>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1100"/>
+        <location filename="src/interface/window_main.cpp" line="848"/>
         <source>A card database update is already running.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1155"/>
+        <location filename="src/interface/window_main.cpp" line="903"/>
         <source>Unable to run the card database updater: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1167"/>
+        <location filename="src/interface/window_main.cpp" line="912"/>
         <source>Card database update running.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1220"/>
+        <location filename="src/interface/window_main.cpp" line="930"/>
         <source>Failed to start. The file might be missing, or permissions might be incorrect.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1223"/>
+        <location filename="src/interface/window_main.cpp" line="933"/>
         <source>The process crashed some time after starting successfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1227"/>
+        <location filename="src/interface/window_main.cpp" line="937"/>
         <source>Timed out. The process took too long to respond. The last waitFor...() function timed out.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1230"/>
+        <location filename="src/interface/window_main.cpp" line="940"/>
         <source>An error occurred when attempting to write to the process. For example, the process may not be running, or it may have closed its input channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1234"/>
+        <location filename="src/interface/window_main.cpp" line="944"/>
         <source>An error occurred when attempting to read from the process. For example, the process may not be running.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1239"/>
+        <location filename="src/interface/window_main.cpp" line="949"/>
         <source>Unknown error occurred.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1244"/>
+        <location filename="src/interface/window_main.cpp" line="954"/>
         <source>The card database updater exited with an error:
 %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1324"/>
-        <location filename="src/interface/window_main.cpp" line="1333"/>
-        <location filename="src/interface/window_main.cpp" line="1339"/>
-        <location filename="src/interface/window_main.cpp" line="1367"/>
-        <location filename="src/interface/window_main.cpp" line="1371"/>
+        <location filename="src/interface/window_main.cpp" line="1019"/>
+        <location filename="src/interface/window_main.cpp" line="1028"/>
+        <location filename="src/interface/window_main.cpp" line="1034"/>
+        <location filename="src/interface/window_main.cpp" line="1062"/>
+        <location filename="src/interface/window_main.cpp" line="1066"/>
         <source>Load sets/cards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1333"/>
+        <location filename="src/interface/window_main.cpp" line="1028"/>
         <source>Selected file cannot be found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1339"/>
+        <location filename="src/interface/window_main.cpp" line="1034"/>
         <source>You can only import XML databases at this time.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1368"/>
+        <location filename="src/interface/window_main.cpp" line="1063"/>
         <source>The new sets/cards have been added successfully.
 Cockatrice will now reload the card database.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1371"/>
+        <location filename="src/interface/window_main.cpp" line="1066"/>
         <source>Sets/cards failed to import.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7418,297 +5748,297 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>MessageLogWidget</name>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="42"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="34"/>
         <source> from play</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="44"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="36"/>
         <source> from their graveyard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="46"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="38"/>
         <source> from exile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="48"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="40"/>
         <source> from their hand</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="53"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="45"/>
         <source>the top card of %1&apos;s library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="55"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="47"/>
         <source>the top card of their library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="60"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="52"/>
         <source> from the top of %1&apos;s library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="62"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="54"/>
         <source> from the top of their library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="68"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="60"/>
         <source>the bottom card of %1&apos;s library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="70"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="62"/>
         <source>the bottom card of their library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="75"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="67"/>
         <source> from the bottom of %1&apos;s library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="77"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="69"/>
         <source> from the bottom of their library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="82"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="74"/>
         <source> from %1&apos;s library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="84"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="76"/>
         <source> from their library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="88"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="80"/>
         <source> from sideboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="90"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="82"/>
         <source> from the stack</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="92"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="84"/>
         <source> from custom zone &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="118"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="110"/>
         <source>%1 is now keeping the top card %2 revealed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="119"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="111"/>
         <source>%1 is not revealing the top card %2 any longer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="126"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="118"/>
         <source>%1 can now look at top card %2 at any time.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="127"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="119"/>
         <source>%1 no longer can look at top card %2 at any time.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="137"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="129"/>
         <source>%1 attaches %2 to %3&apos;s %4.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="148"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="140"/>
         <source>%1 has conceded the game.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="157"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="149"/>
         <source>%1 has unconceded the game.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="167"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="159"/>
         <source>%1 has restored connection to the game.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="171"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="163"/>
         <source>%1 has lost connection to the game.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="187"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="179"/>
         <source>%1 points from their %2 to themselves.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="190"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="182"/>
         <source>%1 points from their %2 to %3.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="195"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="187"/>
         <source>%1 points from %2&apos;s %3 to themselves.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="200"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="192"/>
         <source>%1 points from %2&apos;s %3 to %4.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="208"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="200"/>
         <source>%1 points from their %2 to their %3.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="212"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="204"/>
         <source>%1 points from their %2 to %3&apos;s %4.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="218"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="210"/>
         <source>%1 points from %2&apos;s %3 to their own %4.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="224"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="216"/>
         <source>%1 points from %2&apos;s %3 to %4&apos;s %5.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="238"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="230"/>
         <source>%1 creates a face down token.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="240"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="232"/>
         <source>%1 creates token: %2%3.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="251"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="243"/>
         <source>%1 has loaded a deck (%2).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="253"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="245"/>
         <source>%1 has loaded a deck with %2 sideboard cards (%3).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="263"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="255"/>
         <source>%1 destroys %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="298"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="290"/>
         <source>a card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="304"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="296"/>
         <source>%1 gives %2 control over %3.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="316"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="308"/>
         <source>%1 puts %2 into play%3 face down.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="318"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="310"/>
         <source>%1 puts %2 into play%3.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="322"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="314"/>
         <source>%1 puts %2%3 into their graveyard face down.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="324"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="316"/>
         <source>%1 puts %2%3 into their graveyard.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="328"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="320"/>
         <source>%1 exiles %2%3 face down.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="330"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="322"/>
         <source>%1 exiles %2%3.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="333"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="325"/>
         <source>%1 moves %2%3 to their hand.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="336"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="328"/>
         <source>%1 puts %2%3 into their library.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="338"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="330"/>
         <source>%1 puts %2%3 onto the bottom of their library.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="340"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="332"/>
         <source>%1 puts %2%3 on top of their library.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="344"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="336"/>
         <source>%1 puts %2%3 into their library %4 cards from the top.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="347"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="339"/>
         <source>%1 moves %2%3 to sideboard.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="351"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="343"/>
         <source>%1 plays %2%3 face down.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="353"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="345"/>
         <source>%1 plays %2%3.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="358"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="350"/>
         <source>%1 moves %2%3 to custom zone &apos;%4&apos; face down.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="360"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="352"/>
         <source>%1 moves %2%3 to custom zone &apos;%4&apos;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="381"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="373"/>
         <source>%1 tries to draw from an empty library</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="383"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="375"/>
         <source>%1 draws %2 card(s).</source>
         <translation type="unfinished">
             <numerusform></numerusform>
@@ -7716,12 +6046,12 @@ Cockatrice will now reload the card database.</source>
         </translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="393"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="385"/>
         <source>%1 is looking at %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="398"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="390"/>
         <source>%1 is looking at the %4 %3 card(s) %2.</source>
         <comment>top card for singular, top %3 cards for plural</comment>
         <translation type="unfinished">
@@ -7730,72 +6060,72 @@ Cockatrice will now reload the card database.</source>
         </translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="402"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="394"/>
         <source>bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="402"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="394"/>
         <source>top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="410"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="402"/>
         <source>%1 turns %2 face-down.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="413"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="405"/>
         <source>%1 turns %2 face-up.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="419"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="411"/>
         <source>The game has been closed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="424"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="416"/>
         <source>The game has started.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="429"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="421"/>
         <source>You are flooding the game. Please wait a couple of seconds.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="435"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="427"/>
         <source>%1 has joined the game.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="441"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="433"/>
         <source>%1 is now watching the game.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="446"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="438"/>
         <source>You have been kicked out of the game.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="452"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="444"/>
         <source>%1 has left the game (%2).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="460"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="452"/>
         <source>%1 is not watching the game any more (%2).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="467"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="459"/>
         <source>%1 is not ready to start the game any more.</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="476"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="468"/>
         <source>%1 shuffles their deck and draws a new hand of %2 card(s).</source>
         <translation type="unfinished">
             <numerusform></numerusform>
@@ -7803,28 +6133,28 @@ Cockatrice will now reload the card database.</source>
         </translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="481"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="473"/>
         <source>%1 shuffles their deck and draws a new hand.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="487"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="479"/>
         <source>You are watching a replay of game #%1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="492"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="484"/>
         <source>%1 is ready to start the game.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="518"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="510"/>
         <source>cards</source>
         <comment>an unknown amount of cards</comment>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="520"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="512"/>
         <source>%1 card(s)</source>
         <comment>a card for singular, %1 cards for plural</comment>
         <translation type="unfinished">
@@ -7833,107 +6163,107 @@ Cockatrice will now reload the card database.</source>
         </translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="529"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="521"/>
         <source>%1 lends %2 to %3.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="534"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="526"/>
         <source>%1 reveals %2 to %3.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="540"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="532"/>
         <source>%1 reveals %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="546"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="538"/>
         <source>%1 randomly reveals %2%3 to %4.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="552"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="544"/>
         <source>%1 randomly reveals %2%3.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="560"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="552"/>
         <source>%1 peeks at face down card #%2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="564"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="556"/>
         <source>%1 peeks at face down card #%2: %3.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="570"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="562"/>
         <source>%1 reveals %2%3 to %4.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="577"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="569"/>
         <source>%1 reveals %2%3.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="584"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="576"/>
         <source>%1 reversed turn order, now it&apos;s %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="586"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="578"/>
         <source>reversed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="586"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="578"/>
         <source>normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="594"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="586"/>
         <source>Heads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="594"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="586"/>
         <source>Tails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="595"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="587"/>
         <source>%1 flipped a coin. It landed as %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="599"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="591"/>
         <source>%1 rolls a %2 with a %3-sided die.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="606"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="598"/>
         <source>%1 flips %2 coins. There are %3 heads and %4 tails.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="616"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="608"/>
         <source>%1 rolls a %2-sided dice %3 times: %4.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="643"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="636"/>
         <source>%1&apos;s turn.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="649"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="642"/>
         <source>%1 sets annotation of %2 to %3.</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="660"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="653"/>
         <source>%1 places %2 %3%4 counter(s) on %5 (now %6).</source>
         <translation type="unfinished">
             <numerusform></numerusform>
@@ -7941,7 +6271,7 @@ Cockatrice will now reload the card database.</source>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="662"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="655"/>
         <source>%1 removes %2 %3%4 counter(s) from %5 (now %6).</source>
         <translation type="unfinished">
             <numerusform></numerusform>
@@ -7949,102 +6279,102 @@ Cockatrice will now reload the card database.</source>
         </translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="820"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="814"/>
         <source>%1 failed to undo their last draw.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="682"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="675"/>
         <source>%1 sets counter %2 to %3 (%4%5).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="694"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="687"/>
         <source>%1 sets %2 to not untap normally.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="696"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="689"/>
         <source>%1 sets %2 to untap normally.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="715"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="708"/>
         <source>%1 removes the PT of %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="720"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="713"/>
         <source>%1 changes the PT of %2 from nothing to %4.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="723"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="716"/>
         <source>%1 changes the PT of %2 from %3 to %4.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="732"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="725"/>
         <source>%1 has locked their sideboard.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="735"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="728"/>
         <source>%1 has unlocked their sideboard.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="753"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="746"/>
         <source>%1 taps their permanents.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="753"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="746"/>
         <source>%1 untaps their permanents.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="756"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="749"/>
         <source>%1 taps %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="756"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="749"/>
         <source>%1 untaps %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="772"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="765"/>
         <source>%1 shuffles %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="776"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="769"/>
         <source>%1 shuffles the bottom %3 cards of %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="781"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="774"/>
         <source>%1 shuffles the top %3 cards of %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="786"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="779"/>
         <source>%1 shuffles cards %3 - %4 of %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="801"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="794"/>
         <source>%1 unattaches %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="809"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="802"/>
         <source>%1 undoes their last draw.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/log/message_log_widget.cpp" line="811"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="805"/>
         <source>%1 undoes their last draw (%2).</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8052,125 +6382,115 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>MessagesSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="275"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="255"/>
         <source>Word1 Word2 Word3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="276"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="256"/>
         <source>Add New Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="277"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="257"/>
         <source>Edit Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="278"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="258"/>
         <source>Remove Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="224"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="206"/>
         <source>Add message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="224"/>
-        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="237"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="206"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="219"/>
         <source>Message:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="237"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="219"/>
         <source>Edit message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="255"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="237"/>
         <source>Chat settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="256"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="238"/>
         <source>Custom alert words</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="257"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="239"/>
         <source>Enable chat mentions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="258"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="240"/>
         <source>Enable mention completer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="259"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="241"/>
         <source>In-game message macros</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="261"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="243"/>
         <source>How to use in-game message macros</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="262"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="244"/>
         <source>Ignore chat room messages sent by unregistered users</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="263"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="245"/>
         <source>Ignore private messages sent by unregistered users</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="264"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="246"/>
         <source>Ignore private messages sent by non-buddy users</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="265"/>
-        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="266"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="247"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="248"/>
         <source>Invert text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="267"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="249"/>
         <source>Enable desktop notifications for private messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="268"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="250"/>
         <source>Enable desktop notification for mentions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="269"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="251"/>
         <source>Enable room message history on join</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="270"/>
-        <source>Ignore all private messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="271"/>
-        <source>Use game time instead of local time in game logs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="272"/>
-        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="273"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="252"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="253"/>
         <source>(Color is hexadecimal)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="274"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="254"/>
         <source>Separate words with a space, alphanumeric characters only</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8178,42 +6498,42 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>MoveMenu</name>
     <message>
-        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="9"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="8"/>
         <source>Move to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="73"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="72"/>
         <source>&amp;Top of library in random order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="74"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="73"/>
         <source>X cards from the top of library...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="75"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="74"/>
         <source>&amp;Bottom of library in random order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="76"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="75"/>
         <source>T&amp;able</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="77"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="76"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="78"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="77"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="79"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="78"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8292,134 +6612,148 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PaletteEditorDialog</name>
     <message>
-        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="133"/>
-        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="184"/>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="126"/>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="181"/>
         <source>Reset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="156"/>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="127"/>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="182"/>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="128"/>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="183"/>
+        <source>Save &amp;&amp; Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="146"/>
         <source>▼  Edit Palette</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="156"/>
-        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="180"/>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="146"/>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="177"/>
         <source>▶  Edit Palette</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="172"/>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="162"/>
         <source>Palette Editor — %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="173"/>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="163"/>
         <source>&lt;b&gt;Palette Editor&lt;/b&gt; &amp;nbsp;·&amp;nbsp; %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="134"/>
-        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="185"/>
-        <source>Save</source>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="170"/>
+        <source>This theme ships no default palette files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="176"/>
-        <source>Delete this scheme&apos;s custom palette and revert to the theme default (or the application palette)</source>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="172"/>
+        <source>Replace current colours with the theme author&apos;s defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="178"/>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="175"/>
         <source>Switch between the light and dark palette files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="179"/>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="176"/>
         <source>Editing:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="181"/>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="178"/>
         <source>Show or hide the per-role colour grid for manual tweaks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="182"/>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="179"/>
         <source>↺  Revert to theme default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="186"/>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="184"/>
         <source>Discard unsaved edits and restore the last saved palette</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="191"/>
-        <source>Cannot save: this theme has no writable directory</source>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="185"/>
+        <source>Preview this palette without saving to disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="187"/>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="186"/>
         <source>Write palette-%1.toml and reload the theme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="276"/>
-        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="285"/>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="190"/>
+        <source>Cannot save: this theme has no directory on disk</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="262"/>
         <source>Save failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="277"/>
-        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="286"/>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="263"/>
         <source>Could not write %1 to:
 %2</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="287"/>
+        <source>No default found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="288"/>
+        <source>No default palette file found for the &quot;%1&quot; scheme.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PaletteGridWidget</name>
     <message>
-        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="84"/>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="77"/>
         <source>Active</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="84"/>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="77"/>
         <source>Disabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="84"/>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="77"/>
         <source>Inactive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="86"/>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="79"/>
         <source>Normal interactive state</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="87"/>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="80"/>
         <source>Widget is disabled / not interactive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="88"/>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="81"/>
         <source>Window is in background / unfocused</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="139"/>
-        <source>App colors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="140"/>
-        <source>Application-specific colors layered on top of the Qt palette</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>Phase</name>
@@ -8542,21 +6876,30 @@ Cockatrice will now reload the card database.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>PictureLoader</name>
+    <message>
+        <location filename="src/interface/card_picture_loader/card_picture_to_load.cpp" line="255"/>
+        <source>en</source>
+        <comment>code for scryfall&apos;s language property, not available for all languages</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>PlayerActions</name>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="428"/>
-        <location filename="src/game/player/player_actions.cpp" line="433"/>
-        <location filename="src/game/player/player_actions.cpp" line="626"/>
-        <location filename="src/game/player/player_actions.cpp" line="631"/>
+        <location filename="src/game/player/player_actions.cpp" line="426"/>
+        <location filename="src/game/player/player_actions.cpp" line="431"/>
+        <location filename="src/game/player/player_actions.cpp" line="624"/>
+        <location filename="src/game/player/player_actions.cpp" line="629"/>
         <source>grave</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="438"/>
-        <location filename="src/game/player/player_actions.cpp" line="443"/>
-        <location filename="src/game/player/player_actions.cpp" line="636"/>
-        <location filename="src/game/player/player_actions.cpp" line="641"/>
+        <location filename="src/game/player/player_actions.cpp" line="436"/>
+        <location filename="src/game/player/player_actions.cpp" line="441"/>
+        <location filename="src/game/player/player_actions.cpp" line="634"/>
+        <location filename="src/game/player/player_actions.cpp" line="639"/>
         <source>exile</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8675,272 +7018,16 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PlayerMenu</name>
     <message>
-        <location filename="src/game_graphics/player/menu/player_menu.cpp" line="99"/>
+        <location filename="src/game_graphics/player/menu/player_menu.cpp" line="96"/>
         <source>Player &quot;%1&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/player/menu/player_menu.cpp" line="106"/>
+        <location filename="src/game_graphics/player/menu/player_menu.cpp" line="103"/>
         <source>&amp;Counters</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>PlaymatCollectionDialog</name>
-    <message>
-        <location filename="src/interface/widgets/playmat/playmat_collection_dialog.cpp" line="178"/>
-        <source>Default Playmats</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/playmat/playmat_collection_dialog.cpp" line="179"/>
-        <source>Add...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/playmat/playmat_collection_dialog.cpp" line="180"/>
-        <source>Edit...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/playmat/playmat_collection_dialog.cpp" line="181"/>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/playmat/playmat_collection_dialog.cpp" line="182"/>
-        <source>Move Up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/playmat/playmat_collection_dialog.cpp" line="183"/>
-        <source>Move Down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/playmat/playmat_collection_dialog.cpp" line="184"/>
-        <source>List mode:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/playmat/playmat_collection_dialog.cpp" line="185"/>
-        <source>Fixed (always the first entry)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/playmat/playmat_collection_dialog.cpp" line="186"/>
-        <source>Round-robin (cycle through entries)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/playmat/playmat_collection_dialog.cpp" line="187"/>
-        <source>Random (pick one per game)</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PlaymatPreviewWidget</name>
-    <message>
-        <location filename="src/interface/widgets/playmat/playmat_preview_widget.cpp" line="48"/>
-        <source>Playmat crop</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/playmat/playmat_preview_widget.cpp" line="49"/>
-        <location filename="src/interface/widgets/playmat/playmat_preview_widget.cpp" line="62"/>
-        <location filename="src/interface/widgets/playmat/playmat_preview_widget.cpp" line="134"/>
-        <location filename="src/interface/widgets/playmat/playmat_preview_widget.cpp" line="155"/>
-        <location filename="src/interface/widgets/playmat/playmat_preview_widget.cpp" line="257"/>
-        <source>Zoom %1×</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/playmat/playmat_preview_widget.cpp" line="181"/>
-        <source>No card selected</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PlaymatSettingsDialog</name>
-    <message>
-        <location filename="src/interface/widgets/playmat/playmat_settings_dialog.cpp" line="310"/>
-        <source>Playmat Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/playmat/playmat_settings_dialog.cpp" line="311"/>
-        <source>Type a card name...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/playmat/playmat_settings_dialog.cpp" line="312"/>
-        <source>Card name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/playmat/playmat_settings_dialog.cpp" line="313"/>
-        <source>Printing:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/playmat/playmat_settings_dialog.cpp" line="314"/>
-        <source>Show numerical editors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/playmat/playmat_settings_dialog.cpp" line="315"/>
-        <source>Left margin (%):</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/playmat/playmat_settings_dialog.cpp" line="316"/>
-        <source>Right margin (%):</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/playmat/playmat_settings_dialog.cpp" line="317"/>
-        <source>Vertical offset:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/playmat/playmat_settings_dialog.cpp" line="318"/>
-        <source>Zoom:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/playmat/playmat_settings_dialog.cpp" line="319"/>
-        <source>Card</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/playmat/playmat_settings_dialog.cpp" line="320"/>
-        <source>Crop</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/playmat/playmat_settings_dialog.cpp" line="322"/>
-        <source>Drag to pan, scroll to zoom, arrow keys nudge, plus and minus zoom, Backspace or Esc restores. Dimmed strips mark where a wider table crops further.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/playmat/playmat_settings_dialog.cpp" line="324"/>
-        <source>Remove Playmat</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PreferencesSetupPage</name>
-    <message>
-        <location filename="src/interface/widgets/onboarding/pages/preferences_setup_page.cpp" line="116"/>
-        <source>A Few Preferences</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/onboarding/pages/preferences_setup_page.cpp" line="121"/>
-        <source>Defaults are fine — tweak these now or from Settings anytime.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/onboarding/pages/preferences_setup_page.cpp" line="126"/>
-        <source>Gameplay</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/onboarding/pages/preferences_setup_page.cpp" line="127"/>
-        <source>Double-click cards to play them</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/onboarding/pages/preferences_setup_page.cpp" line="128"/>
-        <source>When disabled, a single click plays the selected card onto the table.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/onboarding/pages/preferences_setup_page.cpp" line="129"/>
-        <source>Display hand horizontally</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/onboarding/pages/preferences_setup_page.cpp" line="131"/>
-        <source>Shows your hand as a row along the bottom of the table instead of a column beside it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/onboarding/pages/preferences_setup_page.cpp" line="132"/>
-        <source>Play all nonlands onto the stack by default</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/onboarding/pages/preferences_setup_page.cpp" line="134"/>
-        <source>Cards you play appear on the stack so other players can respond to them, as in a tabletop game.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/onboarding/pages/preferences_setup_page.cpp" line="136"/>
-        <source>Notifications &amp;&amp; Sound</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/onboarding/pages/preferences_setup_page.cpp" line="137"/>
-        <source>Show desktop notifications</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/onboarding/pages/preferences_setup_page.cpp" line="138"/>
-        <source>Play sound effects</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/onboarding/pages/preferences_setup_page.cpp" line="140"/>
-        <source>Startup</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/onboarding/pages/preferences_setup_page.cpp" line="141"/>
-        <source>Startup tab:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/onboarding/pages/preferences_setup_page.cpp" line="147"/>
-        <source>Home</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/onboarding/pages/preferences_setup_page.cpp" line="150"/>
-        <source>Visual Deck Storage</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/onboarding/pages/preferences_setup_page.cpp" line="153"/>
-        <source>Deck Storage</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/onboarding/pages/preferences_setup_page.cpp" line="156"/>
-        <source>Game Replays</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/onboarding/pages/preferences_setup_page.cpp" line="159"/>
-        <source>Deck Editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/onboarding/pages/preferences_setup_page.cpp" line="162"/>
-        <source>Visual Deck Editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/onboarding/pages/preferences_setup_page.cpp" line="165"/>
-        <source>Server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/onboarding/pages/preferences_setup_page.cpp" line="168"/>
-        <source>Server Room</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>PrintingDisabledInfoWidget</name>
     <message>
@@ -8961,12 +7048,12 @@ This setting means you&apos;ll only see the default printing for each card, inst
 <context>
     <name>PrintingSelector</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="101"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="96"/>
         <source>Display Navigation Buttons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="167"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="162"/>
         <source>Printing Selector</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8974,65 +7061,25 @@ This setting means you&apos;ll only see the default printing for each card, inst
 <context>
     <name>PrintingSelectorCardOverlayWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="278"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="202"/>
         <source>Preference</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="286"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="210"/>
         <source>Pin Printing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="293"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="217"/>
         <source>Unpin Printing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="302"/>
-        <source>Image Overrides</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="304"/>
-        <source>Load Custom Image...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="305"/>
-        <source>Clear Custom Image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="327"/>
-        <source>%1 %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="359"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="225"/>
         <source>Show Related cards</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="442"/>
-        <source>Select Card Image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="443"/>
-        <source>Images (*.png *.jpg *.jpeg *.webp)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="452"/>
-        <source>Load Custom Image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="452"/>
-        <source>The selected file could not be read as an image.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>PrintingSelectorCardSearchWidget</name>
@@ -9063,28 +7110,28 @@ This setting means you&apos;ll only see the default printing for each card, inst
 <context>
     <name>PrintingSelectorCardSortingWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="10"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
         <source>Alphabetical</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="11"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
         <source>Preference</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="12"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="9"/>
         <source>Release Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="39"/>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="55"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="36"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="52"/>
         <source>Descending</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="53"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="50"/>
         <source>Ascending</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9100,103 +7147,95 @@ This setting means you&apos;ll only see the default printing for each card, inst
 <context>
     <name>PtMenu</name>
     <message>
-        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="8"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="7"/>
         <source>Power / toughness</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="64"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="63"/>
         <source>&amp;Increase power</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="65"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="64"/>
         <source>&amp;Decrease power</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="66"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="65"/>
         <source>I&amp;ncrease toughness</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="67"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="66"/>
         <source>D&amp;ecrease toughness</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="68"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="67"/>
         <source>In&amp;crease power and toughness</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="69"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="68"/>
         <source>Dec&amp;rease power and toughness</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="70"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="69"/>
         <source>Increase power and decrease toughness</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="71"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="70"/>
         <source>Decrease power and increase toughness</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="72"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="71"/>
         <source>Set &amp;power and toughness...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="73"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="72"/>
         <source>Reset p&amp;ower and toughness</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>PublicDeckPreviewWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/public_deck_preview_widget.cpp" line="114"/>
-        <source>Uploaded %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>QMenuBar</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="432"/>
+        <location filename="src/interface/window_main.cpp" line="400"/>
         <source>Services</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="433"/>
+        <location filename="src/interface/window_main.cpp" line="401"/>
         <source>Hide %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="434"/>
+        <location filename="src/interface/window_main.cpp" line="402"/>
         <source>Hide Others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="435"/>
+        <location filename="src/interface/window_main.cpp" line="403"/>
         <source>Show All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="436"/>
+        <location filename="src/interface/window_main.cpp" line="404"/>
         <source>Preferences...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="437"/>
+        <location filename="src/interface/window_main.cpp" line="405"/>
         <source>Quit %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="438"/>
+        <location filename="src/interface/window_main.cpp" line="406"/>
         <source>About %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9204,17 +7243,17 @@ This setting means you&apos;ll only see the default printing for each card, inst
 <context>
     <name>QObject</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="105"/>
+        <location filename="src/interface/window_main.cpp" line="80"/>
         <source>Cockatrice card database (*.xml)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="106"/>
+        <location filename="src/interface/window_main.cpp" line="81"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="206"/>
+        <location filename="src/interface/window_main.cpp" line="181"/>
         <source>Cockatrice replays (*.cor)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9234,22 +7273,17 @@ This setting means you&apos;ll only see the default printing for each card, inst
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="32"/>
-        <source>Maybeboard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="60"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="117"/>
         <source>Overwrite Existing File?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="61"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="118"/>
         <source>A .cod version of this deck already exists. Overwrite it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/override_printing_warning.cpp" line="12"/>
+        <location filename="src/interface/widgets/dialogs/override_printing_warning.cpp" line="11"/>
         <source>Enabling this feature will disable the use of the Printing Selector.
 
 You will not be able to manage printing preferences on a per-deck basis, or see printings other people have selected for their decks.
@@ -9260,7 +7294,7 @@ Are you sure you would like to enable this feature?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/override_printing_warning.cpp" line="18"/>
+        <location filename="src/interface/widgets/dialogs/override_printing_warning.cpp" line="17"/>
         <source>Disabling this feature will enable the Printing Selector.
 
 You can now choose printings on a per-deck basis in the Deck Editor and configure which printing gets added to a deck by default by pinning it in the Printing Selector.
@@ -9271,110 +7305,100 @@ Are you sure you would like to disable this feature?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/override_printing_warning.cpp" line="28"/>
+        <location filename="src/interface/widgets/dialogs/override_printing_warning.cpp" line="27"/>
         <source>Confirm Change</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="src/interface/widgets/cards/art_crop_attribution.cpp" line="14"/>
-        <source>Art: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/main.cpp" line="362"/>
-        <source>Open deck</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>QPlatformTheme</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="441"/>
+        <location filename="src/interface/window_main.cpp" line="409"/>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="442"/>
+        <location filename="src/interface/window_main.cpp" line="410"/>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="443"/>
+        <location filename="src/interface/window_main.cpp" line="411"/>
         <source>Save All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="444"/>
+        <location filename="src/interface/window_main.cpp" line="412"/>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="445"/>
+        <location filename="src/interface/window_main.cpp" line="413"/>
         <source>&amp;Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="446"/>
+        <location filename="src/interface/window_main.cpp" line="414"/>
         <source>Yes to &amp;All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="447"/>
+        <location filename="src/interface/window_main.cpp" line="415"/>
         <source>&amp;No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="448"/>
+        <location filename="src/interface/window_main.cpp" line="416"/>
         <source>N&amp;o to All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="449"/>
+        <location filename="src/interface/window_main.cpp" line="417"/>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="450"/>
+        <location filename="src/interface/window_main.cpp" line="418"/>
         <source>Retry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="451"/>
+        <location filename="src/interface/window_main.cpp" line="419"/>
         <source>Ignore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="452"/>
+        <location filename="src/interface/window_main.cpp" line="420"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="453"/>
+        <location filename="src/interface/window_main.cpp" line="421"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="454"/>
+        <location filename="src/interface/window_main.cpp" line="422"/>
         <source>Discard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="455"/>
+        <location filename="src/interface/window_main.cpp" line="423"/>
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="456"/>
+        <location filename="src/interface/window_main.cpp" line="424"/>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="457"/>
+        <location filename="src/interface/window_main.cpp" line="425"/>
         <source>Reset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="458"/>
+        <location filename="src/interface/window_main.cpp" line="426"/>
         <source>Restore Defaults</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9382,189 +7406,121 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>QuickSetupPanel</name>
     <message>
-        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="56"/>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="60"/>
         <source>%1%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="66"/>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="68"/>
         <source>&lt;b&gt;Quick Setup&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="67"/>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="69"/>
         <source>Generate all palette roles automatically from a single accent colour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="68"/>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="70"/>
         <source>Accent:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="69"/>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="71"/>
         <source>Primary hue. Used directly for highlights and links.
 At high intensity it also tints buttons and backgrounds.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="71"/>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="73"/>
         <source>Intensity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="72"/>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="74"/>
         <source>Subtle</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="73"/>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="75"/>
         <source>Full colour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="74"/>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="76"/>
         <source>0–30  Subtle tint — only highlights and links change hue
 30–70  Accented — buttons, tooltips, and borders join in
 70–100 Full colour — backgrounds, everything</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="77"/>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="79"/>
         <source>70%</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="81"/>
+        <source>Generate ↓</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="82"/>
+        <source>Derive all palette roles from the accent colour above.
+Fine-tune individual colours in the grid afterwards.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>RemoteDeckList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="141"/>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="177"/>
-        <source>Public</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="143"/>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="179"/>
-        <source>Public (inherited)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="143"/>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="179"/>
-        <source>Private</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="153"/>
-        <source>This folder is visible to other users</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="156"/>
-        <source>This folder is private, but a parent folder is public (inherited).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="157"/>
-        <source>This folder is only visible to you</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="191"/>
-        <source>This deck is visible to other users</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="194"/>
-        <source>This deck is private, but a parent folder is public (inherited).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="195"/>
-        <source>This deck is only visible to you</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="215"/>
+        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="181"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="217"/>
+        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="183"/>
         <source>ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="219"/>
+        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="185"/>
         <source>Upload time</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="221"/>
-        <source>Visibility</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>RemotePublicDecksModel</name>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/remote_public_decks_model.cpp" line="157"/>
-        <source>The server did not respond in time. Try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/remote_public_decks_model.cpp" line="180"/>
-        <source>Failed to load the user&apos;s public decks (server response code %1).</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>RemoteReplayList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="158"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="156"/>
         <source>ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="160"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="158"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="162"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="160"/>
         <source>Players</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="164"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="162"/>
         <source>Keep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="166"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="164"/>
         <source>Time started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="168"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="166"/>
         <source>Duration (sec)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>ReplayQuickSettingsWidget</name>
-    <message>
-        <location filename="src/interface/widgets/replay/replay_quick_settings_widget.cpp" line="42"/>
-        <source>Fast forward speed:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/replay/replay_quick_settings_widget.cpp" line="45"/>
-        <source>Skip empty sections</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>RfgMenu</name>
     <message>
@@ -9606,37 +7562,37 @@ At high intensity it also tints buttons and backgrounds.</source>
 <context>
     <name>RoomSelector</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="50"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="49"/>
         <source>Rooms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="51"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="50"/>
         <source>Joi&amp;n</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="54"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="53"/>
         <source>Room</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="55"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="54"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="56"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="55"/>
         <source>Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="57"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="56"/>
         <source>Players</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="58"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="57"/>
         <source>Games</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9644,7 +7600,7 @@ At high intensity it also tints buttons and backgrounds.</source>
 <context>
     <name>SayMenu</name>
     <message>
-        <location filename="src/game_graphics/player/menu/say_menu.cpp" line="18"/>
+        <location filename="src/game_graphics/player/menu/say_menu.cpp" line="17"/>
         <source>S&amp;ay</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9652,32 +7608,32 @@ At high intensity it also tints buttons and backgrounds.</source>
 <context>
     <name>SequenceEdit</name>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="45"/>
+        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="43"/>
         <source>Choose an action from the table</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="52"/>
+        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="50"/>
         <source>Hit the key/combination of keys you want to set for this action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="177"/>
+        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="175"/>
         <source>Invalid key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="184"/>
+        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="182"/>
         <source>Shortcut already in use by:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="218"/>
+        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="216"/>
         <source>Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="219"/>
+        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="217"/>
         <source>Restore default</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9710,92 +7666,56 @@ At high intensity it also tints buttons and backgrounds.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>ShareBarWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_share/share_bar_widget.cpp" line="43"/>
-        <source>Share name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_share/share_bar_widget.cpp" line="44"/>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_share/share_bar_widget.cpp" line="45"/>
-        <source>Create share link</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SharedDeckPreviewWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_share/shared_deck_preview_widget.cpp" line="42"/>
-        <source>Select this deck</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_share/shared_deck_preview_widget.cpp" line="95"/>
-        <source> (selected)</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>ShortcutSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="106"/>
-        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="130"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="102"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="125"/>
         <source>Restore all default shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="107"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="103"/>
         <source>Do you really want to restore all default shortcuts?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="114"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="110"/>
         <source>Clear all default shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="115"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="111"/>
         <source>Do you really want to clear all shortcuts?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="124"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="120"/>
         <source>Section:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="125"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="121"/>
         <source>Action:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="126"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="122"/>
         <source>Shortcut:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="127"/>
-        <source>Shortcut editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="129"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="124"/>
         <source>How to set custom shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="131"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="126"/>
         <source>Clear all shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="132"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="127"/>
         <source>Search by shortcut name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9849,12 +7769,12 @@ Please check your shortcut settings!</source>
 <context>
     <name>SideboardMenu</name>
     <message>
-        <location filename="src/game_graphics/player/menu/sideboard_menu.cpp" line="23"/>
+        <location filename="src/game_graphics/player/menu/sideboard_menu.cpp" line="22"/>
         <source>&amp;Sideboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/player/menu/sideboard_menu.cpp" line="24"/>
+        <location filename="src/game_graphics/player/menu/sideboard_menu.cpp" line="23"/>
         <source>&amp;View sideboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9862,27 +7782,27 @@ Please check your shortcut settings!</source>
 <context>
     <name>SoundSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="86"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="81"/>
         <source>Enable &amp;sounds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="87"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="82"/>
         <source>Current sounds theme:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="88"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="83"/>
         <source>Test system sound engine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="89"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="84"/>
         <source>Sound settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="90"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="85"/>
         <source>Master volume</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9890,48 +7810,48 @@ Please check your shortcut settings!</source>
 <context>
     <name>SpoilerBackgroundUpdater</name>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="104"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
         <source>Spoilers season has ended</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="104"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
         <source>Deleting spoiler.xml. Please run Oracle</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="114"/>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="121"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="112"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="119"/>
         <source>Spoilers download failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="114"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="112"/>
         <source>No internet connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="121"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="119"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="142"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
         <source>Spoilers already up to date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="142"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
         <source>No new spoilers added</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="187"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
         <source>Spoilers have been updated!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="187"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
         <source>Last change:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9939,170 +7859,157 @@ Please check your shortcut settings!</source>
 <context>
     <name>StableReleaseChannel</name>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="166"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="104"/>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="182"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="120"/>
         <source>No reply received from the release update server.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="190"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="128"/>
         <source>Invalid reply received from the release update server.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="232"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="177"/>
         <source>No reply received from the tag update server.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="239"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="184"/>
         <source>Invalid reply received from the tag update server.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>StatsTally</name>
-    <message>
-        <location filename="src/game_graphics/tally/stats_tally.cpp" line="34"/>
-        <source>Total Power</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/game_graphics/tally/stats_tally.cpp" line="62"/>
-        <source>Total Toughness</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>StorageSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="188"/>
-        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="204"/>
-        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="213"/>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="178"/>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="191"/>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="200"/>
         <source>Success</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="188"/>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="178"/>
         <source>Cached card pictures have been reset.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="204"/>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="191"/>
         <source>Downloaded card pictures have been reset.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="206"/>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="193"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="206"/>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="193"/>
         <source>One or more downloaded card pictures could not be cleared.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="213"/>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="200"/>
         <source>In-memory (currently loaded) card pictures have been reset.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="218"/>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="205"/>
         <source>Card Picture Loader Caching Method:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="221"/>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="208"/>
         <source>The network cache is the preferred way of storing images. Downloaded images are stored here until the size of the cache exceeds the configured size. Cockatrice automatically monitors this cache and deletes the least recently seen card images to ensure the cache does not exceed the configured size.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="226"/>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="213"/>
         <source>Writing card images directly to a folder on your hard drive is another way of storing images. This does not change how Cockatrice accesses or downloads images. Cockatrice will NOT automatically monitor and clear this folder, so if you enable this option, it is up to you to ensure sufficient available space. It should also be noted that if a provider outage causes you to download the wrong picture (i.e. wrong printing) you will be stuck with it until you manually delete the file, as opposed to using the network cache, which automatically rotates and thus correct errors after a while.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="234"/>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="221"/>
         <source>This is the in-memory picture cache used by the application at runtime. It determines how much memory (RAM) Cockatrice can use before it has to fetch card images from the hard disk again. Increasing this will allow more card images to be displayed at once but shouldn&apos;t be necessary. Clearing this will make Cockatrice reload all images from the network cache or the disk.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="239"/>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="226"/>
         <source>Delete Cached Images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="240"/>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="227"/>
         <source>Delete Saved Images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="241"/>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="228"/>
         <source>Clear In-Memory Images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="243"/>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="230"/>
         <source>Card Picture Loader Cache Method</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="244"/>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="231"/>
         <source>Network Cache</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="245"/>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="232"/>
         <source>Filesystem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="246"/>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="233"/>
         <source>In-Memory Picture Cache</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="248"/>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="235"/>
         <source>Network Cache Size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="249"/>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="236"/>
         <source>On-disk cache for downloaded pictures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="250"/>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="237"/>
         <source>Redirect Cache TTL:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="251"/>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="238"/>
         <source>How long cached redirects for urls are valid for.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="252"/>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="239"/>
         <source>Picture Cache Size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="253"/>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="240"/>
         <source>In-memory cache for pictures not currently on screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="254"/>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="241"/>
         <source>Naming scheme:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="256"/>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="243"/>
         <source>Day(s)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10110,33 +8017,17 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabAccount</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_account.cpp" line="54"/>
-        <location filename="src/interface/widgets/tabs/tab_account.cpp" line="135"/>
-        <source>My Reports</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_account.cpp" line="63"/>
+        <location filename="src/interface/widgets/tabs/tab_account.cpp" line="57"/>
         <source>Add to Buddy List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_account.cpp" line="73"/>
+        <location filename="src/interface/widgets/tabs/tab_account.cpp" line="67"/>
         <source>Add to Ignore List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_account.cpp" line="141"/>
-        <source>Buddies are marked with a star in chat, a sound plays when they join or leave the server, and they can be invited to buddy-only games.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_account.cpp" line="143"/>
-        <source>Ignored users&apos; chat messages are hidden from you, and they cannot send you private messages or join your games.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_account.h" line="63"/>
+        <location filename="src/interface/widgets/tabs/tab_account.h" line="60"/>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10257,118 +8148,118 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabArchidekt</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="78"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="311"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="365"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="77"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="336"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="390"/>
         <source>Desc.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="106"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="369"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="105"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="394"/>
         <source>AND</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="107"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="370"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="106"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="395"/>
         <source>Require ALL selected colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="111"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="372"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="110"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="397"/>
         <source>Deck name...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="115"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="373"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="114"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="398"/>
         <source>Owner...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="122"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="374"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="121"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="399"/>
         <source>Packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="129"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="375"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="128"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="400"/>
         <source>Advanced Filters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="208"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="206"/>
         <source>Bracket:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="210"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="264"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="208"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="262"/>
         <source>Any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="244"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="377"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="242"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="402"/>
         <source>Contains card...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="248"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="378"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="246"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="403"/>
         <source>Commander...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="252"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="379"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="250"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="404"/>
         <source>Tag...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="257"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="382"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="255"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="407"/>
         <source>Deck Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="272"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="270"/>
         <source>Cards:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="311"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="365"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="336"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="390"/>
         <source>Asc.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="364"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="389"/>
         <source>Sort by:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="367"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="392"/>
         <source>Filter by:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="386"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="411"/>
         <source>Display Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="125"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="384"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="124"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="409"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="216"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="381"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="214"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="406"/>
         <source>Formats</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10381,42 +8272,42 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabCardArtRules</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="163"/>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="162"/>
         <source>Card:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="164"/>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="163"/>
         <source>ProviderId:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="165"/>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="164"/>
         <source>Mode:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="166"/>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="165"/>
         <source>Reason:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="193"/>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="192"/>
         <source>Type a card name...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="240"/>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="254"/>
         <source>Add rule</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="241"/>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="255"/>
         <source>Remove rule</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="242"/>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="256"/>
         <source>Refresh</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10429,52 +8320,52 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="106"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="102"/>
         <source>Card Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="107"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="103"/>
         <source>Deck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="108"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="104"/>
         <source>Filters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="103"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="99"/>
         <source>&amp;View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="105"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="101"/>
         <source>Card Database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="109"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="105"/>
         <source>Printing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="112"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="108"/>
         <source>Visible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="113"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="109"/>
         <source>Floating</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="116"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="112"/>
         <source>Reset layout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="86"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="82"/>
         <source>Deck: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10482,49 +8373,49 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabDeckEditorVisual</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="157"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="129"/>
         <source>Visual Deck: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="335"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="294"/>
         <source>&amp;Visual Deck Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="337"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="343"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="296"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="302"/>
         <source>Card Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="338"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="344"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="297"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="303"/>
         <source>Deck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="341"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="300"/>
         <source>&amp;View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="346"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="305"/>
         <source>Printing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="349"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="308"/>
         <source>Visible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="350"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="309"/>
         <source>Floating</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="353"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="312"/>
         <source>Reset layout</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10532,22 +8423,22 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabDeckEditorVisualTabWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="63"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="62"/>
         <source>Visual Deck View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="64"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="63"/>
         <source>Visual Database Display</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="65"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="64"/>
         <source>Deck Analytics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="66"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="65"/>
         <source>Sample Hand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10555,245 +8446,138 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabDeckStorage</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="233"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="167"/>
         <source>Local file system</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="234"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="168"/>
         <source>Server deck storage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="236"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="239"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="170"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="173"/>
         <source>Open in deck editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="237"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="171"/>
         <source>Rename deck or folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="238"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="172"/>
         <source>Upload deck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="240"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="174"/>
         <source>Download deck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="241"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="242"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="468"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="611"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="175"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="176"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="380"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="523"/>
         <source>New folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="243"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="244"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="177"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="178"/>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="245"/>
-        <source>Share decks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="246"/>
-        <source>Publish/unpublish deck</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="247"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="179"/>
         <source>Open decks folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="344"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="263"/>
         <source>Rename local folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="344"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="263"/>
         <source>Rename local file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="347"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="266"/>
         <source>New name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="362"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="393"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="402"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="426"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="445"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="938"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="947"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="281"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="316"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="340"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="357"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="362"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="281"/>
         <source>Rename failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="393"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="402"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="426"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="316"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="340"/>
         <source>Invalid deck file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="411"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="325"/>
         <source>Enter deck name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="411"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="325"/>
         <source>This decklist does not have a name.
 Please enter a name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="417"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="331"/>
         <source>Unnamed deck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="445"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="357"/>
         <source>Failed to upload deck to server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="484"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="396"/>
         <source>Delete local file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="484"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="396"/>
         <source>Are you sure you want to delete the selected files?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="649"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="561"/>
         <source>Delete remote decks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="649"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="561"/>
         <source>Are you sure you want to delete the selected decks?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="731"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="811"/>
-        <source>Shared decks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="761"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="790"/>
-        <source>Only one folder can be shared at a time.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="763"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="800"/>
-        <source>Share either a folder or decks, not both.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="765"/>
-        <source>Select folders or decks in the tree to share.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message numerus="yes">
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="771"/>
-        <source>%n folder(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="774"/>
-        <source>%n deck(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="776"/>
-        <source>No decks selected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="777"/>
-        <source>Selected: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="804"/>
-        <source>The root folder cannot be shared.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="826"/>
-        <source>Select decks to share.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="852"/>
-        <source>Failed to create the share link (server response code %1).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="860"/>
-        <source>Share link copied to the clipboard.
-Expires on %1.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="866"/>
-        <source>Share link</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="878"/>
-        <source>The server did not respond in time. Try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="931"/>
-        <source>Failed to change deck visibility on server (response code %1).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message numerus="yes">
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="948"/>
-        <source>Failed to change the visibility of %n selected deck(s).</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="468"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="611"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="380"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="523"/>
         <source>Name of new folder:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.h" line="112"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.h" line="87"/>
         <source>Deck Storage</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10801,277 +8585,20 @@ Expires on %1.</source>
 <context>
     <name>TabDeckStorageVisual</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="39"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="35"/>
         <source>Visual Deck Storage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="83"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="83"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
         <source>Could not open deck at %1</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="98"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="156"/>
-        <source>Shared decks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="118"/>
-        <source>Share deck</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="118"/>
-        <source>You must be connected to the server to share a deck.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message numerus="yes">
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="134"/>
-        <source>%n deck(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="136"/>
-        <source>Click deck tiles to select the decks you want to share.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="138"/>
-        <source>One deck selected. Create the link to share it with other players.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message numerus="yes">
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="140"/>
-        <source>%n decks selected. Create the link to share them with other players.</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="149"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="163"/>
-        <source>Share decks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="149"/>
-        <source>Select at least one deck to share.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="163"/>
-        <source>Unable to load deck file %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="192"/>
-        <source>Failed to create the share link (server response code %1).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="201"/>
-        <source>Share link copied to the clipboard.
-Expires on %1.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="216"/>
-        <source>Share link</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="228"/>
-        <source>The server did not respond in time. Try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TabDeveloper</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_developer.cpp" line="94"/>
-        <source>Auto-refresh</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_developer.cpp" line="95"/>
-        <source>Automatically request fresh server statistics at a fixed interval.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_developer.cpp" line="96"/>
-        <source> s</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_developer.cpp" line="97"/>
-        <source>Seconds between automatic refreshes.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_developer.cpp" line="98"/>
-        <source>Refresh server stats</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_developer.cpp" line="99"/>
-        <source>Statistic;Value</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_developer.cpp" line="100"/>
-        <source>Command;Count;Total ms;Avg ms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_developer.cpp" line="112"/>
-        <source>%1 GiB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_developer.cpp" line="115"/>
-        <source>%1 MiB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_developer.cpp" line="118"/>
-        <source>%1 KiB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_developer.cpp" line="120"/>
-        <source>%1 bytes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_developer.cpp" line="126"/>
-        <source>%1 s</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_developer.cpp" line="128"/>
-        <source>%1 ms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_developer.cpp" line="186"/>
-        <source>No server statistics available yet.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_developer.cpp" line="195"/>
-        <source>Registered users online</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_developer.cpp" line="196"/>
-        <source>Moderators online</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_developer.cpp" line="197"/>
-        <source>Games running</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_developer.cpp" line="198"/>
-        <source>Traffic sent (last tick)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_developer.cpp" line="199"/>
-        <source>Traffic received (last tick)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_developer.cpp" line="205"/>
-        <source>Server uptime</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_developer.cpp" line="205"/>
-        <source>%1d %2h %3m</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_developer.cpp" line="206"/>
-        <source>%1h %2m</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_developer.cpp" line="209"/>
-        <source>Snapshot taken</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_developer.cpp" line="212"/>
-        <source>Live Metrics</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_developer.cpp" line="213"/>
-        <source>Cards in live games</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_developer.cpp" line="214"/>
-        <source>Total commands processed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_developer.cpp" line="218"/>
-        <source>Avg command time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_developer.cpp" line="220"/>
-        <source>Active command types</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_developer.cpp" line="222"/>
-        <source>Event loop stalls</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_developer.cpp" line="223"/>
-        <source>Last stall overshoot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_developer.cpp" line="224"/>
-        <source>Worst stall overshoot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_developer.cpp" line="227"/>
-        <source>Game starts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_developer.cpp" line="229"/>
-        <source>Avg game start time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_developer.cpp" line="260"/>
-        <source>Updated %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_developer.h" line="51"/>
-        <source>Developer</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>TabEdhRec</name>
@@ -11084,27 +8611,27 @@ Expires on %1.</source>
 <context>
     <name>TabEdhRecMain</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="111"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="130"/>
         <source>&amp;Cards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="112"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="131"/>
         <source>Top Commanders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="113"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="132"/>
         <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="114"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="133"/>
         <source>Search for a card ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="115"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="134"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11117,207 +8644,191 @@ Expires on %1.</source>
 <context>
     <name>TabGame</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="295"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="305"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="1006"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="273"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="283"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="923"/>
         <source>Replay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="295"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="305"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="273"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="283"/>
         <source>Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="299"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="385"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="277"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="354"/>
         <source>Player List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="310"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="1340"/>
-        <source>Invite</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="312"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="383"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="287"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="352"/>
         <source>Card Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="313"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="384"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="288"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="353"/>
         <source>Messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="315"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="388"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="290"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="357"/>
         <source>Replay Timeline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="322"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="297"/>
         <source>&amp;Phases</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="325"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="300"/>
         <source>&amp;Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="327"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="302"/>
         <source>Next &amp;phase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="330"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="305"/>
         <source>Next phase with &amp;action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="333"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="308"/>
         <source>Next &amp;turn</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="336"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="311"/>
         <source>Reverse turn order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="339"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="314"/>
         <source>&amp;Remove all local arrows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="342"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
         <source>Rotate View Cl&amp;ockwise</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="345"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="320"/>
         <source>Rotate View Co&amp;unterclockwise</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="348"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="323"/>
         <source>Game &amp;information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="351"/>
-        <source>Cop&amp;y game link</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="354"/>
-        <source>Invite to Game...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="358"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="327"/>
         <source>Un&amp;concede</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="360"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="911"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="933"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="329"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="829"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="850"/>
         <source>&amp;Concede</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="367"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="336"/>
         <source>&amp;Leave game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="365"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="334"/>
         <source>C&amp;lose replay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="371"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
         <source>&amp;Focus Chat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="374"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
         <source>&amp;Say:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="378"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="347"/>
         <source>Selected cards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="381"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="350"/>
         <source>&amp;View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="392"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="361"/>
         <source>Visible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="393"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="362"/>
         <source>Floating</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="396"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="365"/>
         <source>Reset layout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="580"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="499"/>
         <source>Concede</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="580"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="499"/>
         <source>Are you sure you want to concede this game?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="586"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="505"/>
         <source>Unconcede</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="587"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="506"/>
         <source>You have already conceded.  Do you want to return to this game?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="605"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="524"/>
         <source>Leave game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="605"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="524"/>
         <source>Are you sure you want to leave this game?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="719"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="637"/>
         <source>A player has joined game #%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="720"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="638"/>
         <source>%1 has joined the game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="729"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="647"/>
         <source>You have been kicked out of the game.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11333,157 +8844,157 @@ Expires on %1.</source>
 <context>
     <name>TabLog</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.h" line="67"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.h" line="66"/>
         <source>Logs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="29"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="35"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="41"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="28"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="34"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="40"/>
         <source>Time;SenderName;SenderIP;Message;TargetID;TargetName</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="44"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="43"/>
         <source>Room Logs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="45"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="44"/>
         <source>Game Logs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="46"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="45"/>
         <source>Chat Logs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="67"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="77"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="66"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="76"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="67"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="66"/>
         <source>You must select at least one filter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="77"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="76"/>
         <source>You have to select a valid number of days to locate.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="161"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="150"/>
         <source>Username: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="165"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="154"/>
         <source>IP Address: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="169"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="158"/>
         <source>Game Name: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="173"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="162"/>
         <source>GameID: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="177"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="166"/>
         <source>Message: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="182"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="171"/>
         <source>Main Room</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="183"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="172"/>
         <source>Game Room</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="184"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="173"/>
         <source>Private Chat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="194"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="175"/>
         <source>Past X Days: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="195"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="176"/>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="196"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="177"/>
         <source>Last Hour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="200"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="181"/>
         <source>Maximum Results: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="204"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="185"/>
         <source>At least one filter is required.
 The more information you put in, the more specific your results will be.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="207"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="188"/>
         <source>Get User Logs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="211"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="192"/>
         <source>Clear Filters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="227"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="208"/>
         <source>Filters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="237"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="218"/>
         <source>Log Locations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="246"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="227"/>
         <source>Date Range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="253"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="234"/>
         <source>Maximum Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="290"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="296"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="271"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="277"/>
         <source>Message History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="291"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="272"/>
         <source>Failed to collect message history information.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="297"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="278"/>
         <source>There are no messages for the selected filters.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11491,558 +9002,218 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabMessage</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="72"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="69"/>
         <source>Private &amp;chat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="73"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="70"/>
         <source>&amp;Leave</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="90"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="87"/>
         <source>%1 - Private chat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="102"/>
-        <source>You have ignored %1; your messages are not delivered.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="148"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="116"/>
         <source>This user is ignoring you, they cannot see your messages in main chat and you cannot join their games.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="189"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="150"/>
         <source>Private message from</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="206"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="167"/>
         <source>%1 has left the server.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="212"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="173"/>
         <source>%1 has joined the server.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="219"/>
-        <source>Message not sent — %1 is offline.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TabModeration</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_moderation.cpp" line="171"/>
-        <source>User name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_moderation.cpp" line="172"/>
-        <source>Investigate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_moderation.cpp" line="173"/>
-        <location filename="src/interface/widgets/tabs/tab_moderation.cpp" line="404"/>
-        <source>Reset Password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_moderation.cpp" line="174"/>
-        <location filename="src/interface/widgets/tabs/tab_moderation.cpp" line="441"/>
-        <source>Remove Avatar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_moderation.cpp" line="175"/>
-        <source>Refresh</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_moderation.cpp" line="177"/>
-        <source>User Info</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_moderation.cpp" line="178"/>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_moderation.cpp" line="179"/>
-        <source>Registered:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_moderation.cpp" line="180"/>
-        <source>Last login:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_moderation.cpp" line="181"/>
-        <source>Status:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_moderation.cpp" line="182"/>
-        <source>Counts:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_moderation.cpp" line="183"/>
-        <source>Admin notes:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_moderation.cpp" line="185"/>
-        <source>Alts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_moderation.cpp" line="186"/>
-        <source>Sessions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_moderation.cpp" line="187"/>
-        <source>Staff Last Logins</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_moderation.cpp" line="189"/>
-        <location filename="src/interface/widgets/tabs/tab_moderation.cpp" line="192"/>
-        <source>User</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_moderation.cpp" line="189"/>
-        <source>eMail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_moderation.cpp" line="189"/>
-        <location filename="src/interface/widgets/tabs/tab_moderation.cpp" line="191"/>
-        <source>Client ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_moderation.cpp" line="189"/>
-        <source>Registered</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_moderation.cpp" line="189"/>
-        <location filename="src/interface/widgets/tabs/tab_moderation.cpp" line="192"/>
-        <source>Last login</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_moderation.cpp" line="190"/>
-        <source>Warns</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_moderation.cpp" line="190"/>
-        <source>Bans</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_moderation.cpp" line="190"/>
-        <location filename="src/interface/widgets/tabs/tab_moderation.cpp" line="321"/>
-        <source>Active</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_moderation.cpp" line="191"/>
-        <source>IP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_moderation.cpp" line="191"/>
-        <source>Start</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_moderation.cpp" line="191"/>
-        <source>End</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_moderation.cpp" line="191"/>
-        <source>Type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_moderation.cpp" line="192"/>
-        <source>Level</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_moderation.cpp" line="198"/>
-        <source>Unknown</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_moderation.cpp" line="246"/>
-        <location filename="src/interface/widgets/tabs/tab_moderation.cpp" line="247"/>
-        <source>Loading...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_moderation.cpp" line="264"/>
-        <source>Error loading user info.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_moderation.cpp" line="277"/>
-        <source>active</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_moderation.cpp" line="277"/>
-        <source>inactive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_moderation.cpp" line="279"/>
-        <source>admin</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_moderation.cpp" line="283"/>
-        <source>Reports: %1   Bans: %2   Warnings: %3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_moderation.cpp" line="291"/>
-        <source>(none)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_moderation.cpp" line="354"/>
-        <source>yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_moderation.cpp" line="354"/>
-        <source>no</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_moderation.cpp" line="382"/>
-        <source>Admin</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_moderation.cpp" line="385"/>
-        <source>Developer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_moderation.cpp" line="388"/>
-        <source>Moderator</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_moderation.cpp" line="391"/>
-        <source>Judge</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_moderation.cpp" line="405"/>
-        <source>Reset the password of %1? A temporary password will be generated and shown to you. The user must change it on their first login.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_moderation.cpp" line="423"/>
-        <location filename="src/interface/widgets/tabs/tab_moderation.cpp" line="458"/>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_moderation.cpp" line="423"/>
-        <source>Password reset failed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_moderation.cpp" line="428"/>
-        <source>Password reset</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_moderation.cpp" line="429"/>
-        <source>Temporary password for %1:
-
-%2
-
-Pass it to the user through a secure channel.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_moderation.cpp" line="442"/>
-        <source>Remove the avatar of %1? The user will have to upload a new one.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_moderation.cpp" line="458"/>
-        <source>Could not remove the avatar.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_moderation.cpp" line="463"/>
-        <source>Avatar removed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_moderation.cpp" line="464"/>
-        <source>The avatar of %1 has been removed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_moderation.h" line="29"/>
-        <source>Moderation</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TabPublicDecks</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_public_decks.cpp" line="37"/>
-        <location filename="src/interface/widgets/tabs/tab_public_decks.cpp" line="119"/>
-        <location filename="src/interface/widgets/tabs/tab_public_decks.cpp" line="125"/>
-        <source>Public decks of %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_public_decks.cpp" line="49"/>
-        <location filename="src/interface/widgets/tabs/tab_public_decks.cpp" line="129"/>
-        <location filename="src/interface/widgets/tabs/tab_public_decks.cpp" line="161"/>
-        <source>This user has not published any decks.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_public_decks.cpp" line="128"/>
-        <location filename="src/interface/widgets/tabs/tab_public_decks.cpp" line="160"/>
-        <source>No decks match your filters.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_public_decks.cpp" line="130"/>
-        <location filename="src/interface/widgets/tabs/tab_public_decks.cpp" line="131"/>
-        <source>Refresh</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_public_decks.cpp" line="132"/>
-        <source>Public Decks Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_public_decks.cpp" line="200"/>
-        <source>Loading public decks…</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_public_decks.cpp" line="238"/>
-        <location filename="src/interface/widgets/tabs/tab_public_decks.cpp" line="248"/>
-        <source>Open public deck</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_public_decks.cpp" line="239"/>
-        <source>Failed to open the public deck (server response code %1).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_public_decks.cpp" line="248"/>
-        <source>The public deck could not be parsed.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>TabReplays</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="211"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="200"/>
         <source>Local file system</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="212"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="201"/>
         <source>Server replay storage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="214"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="219"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="203"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="208"/>
         <source>Watch replay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="215"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="204"/>
         <source>Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="216"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="338"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="205"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="323"/>
         <source>New folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="217"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="222"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="206"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="211"/>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="218"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="207"/>
         <source>Open replays folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="220"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="209"/>
         <source>Download replay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="221"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="210"/>
         <source>Toggle expiration lock</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="223"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="212"/>
         <source>Get replay share code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="225"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="597"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="214"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="582"/>
         <source>Look up replay by share code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="302"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="287"/>
         <source>Rename local folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="302"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="287"/>
         <source>Rename local file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="305"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="290"/>
         <source>New name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="320"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="305"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="320"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="305"/>
         <source>Rename failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="338"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="323"/>
         <source>Name of new folder:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="354"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="339"/>
         <source>Delete local file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="354"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="339"/>
         <source>Are you sure you want to delete the selected files?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="520"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="505"/>
         <source>Are you sure you want to delete the selected replays?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="568"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="553"/>
         <source>Failed to get code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="570"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="631"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="555"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="616"/>
         <source>Either this server does not support replay sharing, or does not permit replay sharing for you.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="576"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="624"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="636"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="561"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="609"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="621"/>
         <source>Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="576"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="561"/>
         <source>Could not get replay code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="584"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="569"/>
         <source>Replay Share Code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="586"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="571"/>
         <source>Others can use this code to add the replay to their list of remote replays:
 %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="588"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="573"/>
         <source>Copy to clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="597"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="582"/>
         <source>Replay share code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="618"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="603"/>
         <source>Replay code found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="619"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="604"/>
         <source>Replay was added, or you already had access to it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="624"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="609"/>
         <source>Replay code not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="629"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="614"/>
         <source>Failed to submit code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="636"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="621"/>
         <source>Unexpected error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="519"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="504"/>
         <source>Delete remote replay</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12052,478 +9223,65 @@ Pass it to the user through a secure channel.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>TabReport</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="265"/>
-        <source>Search by username, category...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="267"/>
-        <source>All Statuses</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="268"/>
-        <source>Open</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="269"/>
-        <source>Assigned</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="270"/>
-        <source>Resolved</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="271"/>
-        <source>Dismissed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="272"/>
-        <source>Unresolved only</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="273"/>
-        <source>Refresh</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="275"/>
-        <source>#</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="275"/>
-        <source>Time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="275"/>
-        <source>Reporter</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="275"/>
-        <source>Reported User</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="275"/>
-        <source>Category</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="276"/>
-        <source>Game ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="276"/>
-        <source>Status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="276"/>
-        <source>Assigned To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="276"/>
-        <source>Replay</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="276"/>
-        <source>Room</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="278"/>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="279"/>
-        <source>Chat Log Context</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="281"/>
-        <source>Chat log attached by the reporter. It is captured from their client and may be incomplete or edited.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="282"/>
-        <source>Comments / Thread</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="283"/>
-        <source>No description.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="284"/>
-        <source>No chat log attached.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="285"/>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="549"/>
-        <source>No comments yet.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="286"/>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="509"/>
-        <source>Type a reply...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="287"/>
-        <source>Send</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="289"/>
-        <source>Reported User Context</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="290"/>
-        <source>User:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="291"/>
-        <source>Account Age:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="292"/>
-        <source>Reports:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="293"/>
-        <source>Bans:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="294"/>
-        <source>Warns:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="295"/>
-        <source>Admin Notes:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="296"/>
-        <source>Recent Reports Against User:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="302"/>
-        <source>Report Statistics</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="304"/>
-        <source>Assign to Me</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="305"/>
-        <source>Resolve</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="306"/>
-        <source>Resolve with note...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="307"/>
-        <source>Dismiss...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="308"/>
-        <source>View Replay</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="309"/>
-        <source>Join Game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="319"/>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="515"/>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="516"/>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="790"/>
-        <source>Loading...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="339"/>
-        <source>Failed to load reports.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="432"/>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="432"/>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="442"/>
-        <source>%1 report(s)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="461"/>
-        <source>%1 open  |  %2 assigned  |  %3 resolved  |  %4 dismissed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="507"/>
-        <source>This report is closed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="537"/>
-        <source>Failed to load report details.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="549"/>
-        <source>[Moderator]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="550"/>
-        <source>[Reporter]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="625"/>
-        <source>Assigning...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="638"/>
-        <source>Assigned.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="641"/>
-        <source>Assignment failed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="656"/>
-        <source>Dismiss Report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="656"/>
-        <source>Resolve Report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="657"/>
-        <source>Optional note:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="657"/>
-        <source>Resolution note (optional):</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="665"/>
-        <source>Dismissing...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="665"/>
-        <source>Resolving...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="682"/>
-        <source>Done.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="685"/>
-        <source>Action failed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="698"/>
-        <source>Loading replay...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="711"/>
-        <source>No replay available for this game.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="720"/>
-        <source>Replay opened.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="723"/>
-        <source>Failed to parse replay.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="738"/>
-        <source>No room recorded for this report, use the replay instead.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="743"/>
-        <source>Attempting to join game...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="776"/>
-        <source>Failed to send comment.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="808"/>
-        <source>Error loading user info.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="820"/>
-        <source>%1 days (since %2)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="829"/>
-        <source>(none)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="834"/>
-        <source>No previous reports against this user.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="852"/>
-        <source>Loading statistics...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="867"/>
-        <source>Error loading statistics.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="873"/>
-        <source>Total: %1 reports (%2 open, %3 assigned, %4 resolved/dismissed)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="879"/>
-        <source>Last 24h: %1  |  Last 7d: %2  |  Last 30d: %3  |  Avg resolution: %4h</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="886"/>
-        <source>This week: %1 vs last week: %2 (%3%)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="896"/>
-        <source>By category:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="900"/>
-        <source>=== Top Categories ===</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="911"/>
-        <source>=== Most Reported Users ===</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.cpp" line="920"/>
-        <source>=== Top Reporters ===</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_report.h" line="31"/>
-        <source>Report Queue</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>TabRoom</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="180"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="67"/>
+        <source>Friends</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="68"/>
+        <source>Online</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="69"/>
+        <source>Ignored</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="161"/>
         <source>&amp;Say:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="181"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="162"/>
         <source>Chat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="182"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="163"/>
         <source>&amp;Room</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="183"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="164"/>
         <source>&amp;Leave room</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="184"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="165"/>
         <source>&amp;Clear chat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="185"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="166"/>
         <source>Chat Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="197"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="178"/>
         <source> mentioned you.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="205"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="186"/>
         <source>Click to view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="250"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="231"/>
         <source>You are flooding the chat. Please wait a couple of seconds.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12531,35 +9289,35 @@ Pass it to the user through a secure channel.</source>
 <context>
     <name>TabServer</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.h" line="81"/>
+        <location filename="src/interface/widgets/tabs/tab_server.h" line="68"/>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="237"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="249"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="267"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="275"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="214"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="219"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="224"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="229"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="238"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="215"/>
         <source>Failed to join the server room: it doesn&apos;t exist on the server.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="250"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="220"/>
         <source>The server thinks you are in the server room but your client is unable to display it. Try restarting your client.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="268"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="225"/>
         <source>You do not have the required permission to join this server room.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="276"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="230"/>
         <source>Failed to join the server room due to an unknown error: %1.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12567,176 +9325,97 @@ Pass it to the user through a secure channel.</source>
 <context>
     <name>TabSupervisor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="240"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="217"/>
         <source>Deck Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="241"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="218"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="242"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="219"/>
         <source>EDHRec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="243"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="220"/>
         <source>Archidekt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="244"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="221"/>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="245"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="222"/>
         <source>&amp;Visual Deck Storage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="246"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="223"/>
         <source>Visual Database Display</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="247"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="224"/>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="248"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="225"/>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="249"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="226"/>
         <source>Deck Storage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="250"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="227"/>
         <source>Game Replays</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="251"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="228"/>
         <source>Administration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="252"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="229"/>
         <source>Logs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="253"/>
-        <source>Report Queue</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="254"/>
-        <source>Moderation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="255"/>
-        <source>Card Art Rules</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="256"/>
-        <source>Developer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="330"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="293"/>
         <source>Are you sure?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="331"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="294"/>
         <source>There are still open games. Are you sure you want to quit?</source>
         <translation type="unfinished"></translation>
     </message>
-    <message numerus="yes">
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="968"/>
-        <source>Connection quality over the last %n sample(s):</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="969"/>
-        <source>Last: %1 ms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="969"/>
-        <source>Median: %1 ms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="970"/>
-        <source>95th percentile: %1 ms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="970"/>
-        <source>Maximum: %1 ms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1123"/>
-        <source>Game joins are only available on a remote server.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1137"/>
-        <source>Could not join game %1.
-%2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1169"/>
-        <source>Ignored user</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1170"/>
-        <source>You have ignored %1. Remove them from your ignore list to open a private chat.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1229"/>
-        <source>Game #%1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1229"/>
-        <source>Game #%1 — %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1437"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1075"/>
         <source>Click to view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1466"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1104"/>
         <source>Your buddy %1 has signed on!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1515"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1148"/>
         <source>Unknown Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1516"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1149"/>
         <source>The server has sent you a message that your client does not understand.
 This message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version.
 
@@ -12744,38 +9423,38 @@ To update your client, go to Help -&gt; Check for Updates.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1521"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1154"/>
         <source>Idle Timeout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1521"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1154"/>
         <source>You are about to be logged out due to inactivity.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1525"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1158"/>
         <source>Promotion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1526"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1159"/>
         <source>You have been promoted. Please log out and back in for changes to take effect.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1530"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1163"/>
         <source>Warned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1531"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1164"/>
         <source>You have received a warning due to %1.
 Please refrain from engaging in this activity or further actions may be taken against you. If you have any questions, please private message a moderator.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1546"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1179"/>
         <source>You have received the following message from the server.
 (custom messages like these could be untranslated)</source>
         <translation type="unfinished"></translation>
@@ -12794,34 +9473,6 @@ Please refrain from engaging in this activity or further actions may be taken ag
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>TallyMenu</name>
-    <message>
-        <location filename="src/game_graphics/player/menu/tally_menu.cpp" line="54"/>
-        <source>Tally</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/game_graphics/player/menu/tally_menu.cpp" line="56"/>
-        <source>None</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/game_graphics/player/menu/tally_menu.cpp" line="57"/>
-        <source>Subtypes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/game_graphics/player/menu/tally_menu.cpp" line="58"/>
-        <source>Total Power</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/game_graphics/player/menu/tally_menu.cpp" line="59"/>
-        <source>Total Toughness</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>TappedOutInterface</name>
     <message>
@@ -12836,65 +9487,6 @@ Please refrain from engaging in this activity or further actions may be taken ag
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>ThemeSetupPage</name>
-    <message>
-        <location filename="src/interface/widgets/onboarding/pages/theme_setup_page.cpp" line="46"/>
-        <source>Light</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/onboarding/pages/theme_setup_page.cpp" line="47"/>
-        <source>Dark</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/onboarding/pages/theme_setup_page.cpp" line="49"/>
-        <source>Match system</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/onboarding/pages/theme_setup_page.cpp" line="102"/>
-        <source>Theme:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/onboarding/pages/theme_setup_page.cpp" line="103"/>
-        <source>Appearance:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/onboarding/pages/theme_setup_page.cpp" line="104"/>
-        <source>Home screen background:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/onboarding/pages/theme_setup_page.cpp" line="230"/>
-        <source>Save failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/onboarding/pages/theme_setup_page.cpp" line="231"/>
-        <source>Could not write the theme palette to:
-%1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/onboarding/pages/theme_setup_page.cpp" line="265"/>
-        <source>Pick a Look</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/onboarding/pages/theme_setup_page.cpp" line="270"/>
-        <source>You can fine-tune every colour later from Settings → Appearance.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/onboarding/pages/theme_setup_page.cpp" line="275"/>
-        <source>Accent colour (optional)</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>TipsOfTheDay</name>
     <message>
@@ -12964,52 +9556,57 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserCardArtSettingsDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="453"/>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="98"/>
         <source>Card Art Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="454"/>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="131"/>
         <source>Type a card name...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="455"/>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="190"/>
         <source>Card name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="456"/>
-        <source>Printing:</source>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="191"/>
+        <source>Card ProviderId:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="459"/>
-        <source>Card</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="461"/>
-        <source>Drag to pan, scroll to zoom, arrow keys nudge, plus and minus zoom, Backspace or Esc restores.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="462"/>
-        <source>Banner</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="457"/>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="192"/>
         <source>Left margin (%):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="458"/>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="193"/>
         <source>Right margin (%):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="463"/>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="194"/>
+        <source>Vertical offset:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="195"/>
+        <source>Zoom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="197"/>
+        <source>Parameters</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="204"/>
+        <source>Preview</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="208"/>
         <source>Remove Banner Card</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13017,266 +9614,216 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserContextMenu</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="65"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="59"/>
         <source>User &amp;details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="66"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="60"/>
         <source>Private &amp;chat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="67"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="61"/>
         <source>Show this user&apos;s &amp;games</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="68"/>
-        <source>View this user&apos;s &amp;public decks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="69"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="62"/>
         <source>Add to &amp;buddy list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="70"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="63"/>
         <source>Remove from &amp;buddy list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="71"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="64"/>
         <source>Add to &amp;ignore list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="72"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="65"/>
         <source>Remove from &amp;ignore list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="73"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="66"/>
         <source>Kick from &amp;game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="74"/>
-        <source>Report user</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="75"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="67"/>
         <source>Warn user</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="76"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="68"/>
         <source>View user&apos;s war&amp;n history</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="77"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="69"/>
         <source>Ban from &amp;server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="78"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="70"/>
         <source>View user&apos;s &amp;ban history</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="79"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="71"/>
         <source>&amp;Promote user to moderator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="80"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="72"/>
         <source>Dem&amp;ote user from moderator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="81"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="73"/>
         <source>Promote user to &amp;judge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="82"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="74"/>
         <source>Demote user from judge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="83"/>
-        <source>Promote user to &amp;developer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="84"/>
-        <source>Demote user from de&amp;veloper</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="85"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="75"/>
         <source>View admin notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="82"/>
         <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="86"/>
-        <source>Investigate user</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="93"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="97"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="101"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="90"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="93"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="82"/>
         <source>This user does not exist.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="98"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="87"/>
         <source>You are being ignored by %1 and can&apos;t see their games.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="102"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="91"/>
         <source>Could not get %1&apos;s games.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="129"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="118"/>
         <source>%1&apos;s games</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="185"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="208"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="213"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="173"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="196"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="201"/>
         <source>Ban History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="191"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="179"/>
         <source>Ban Time;Moderator;Ban Length;Ban Reason;Visible Reason</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="209"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="197"/>
         <source>User has never been banned.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="214"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="202"/>
         <source>Failed to collect ban information.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="225"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="246"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="251"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="213"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="234"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="239"/>
         <source>Warning History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="230"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="218"/>
         <source>Warning Time;Moderator;User Name;Reason</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="247"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="235"/>
         <source>User has never been warned.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="252"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="240"/>
         <source>Failed to collect warning information.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="261"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="249"/>
         <source>Failed to get admin notes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="278"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="281"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="266"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="269"/>
         <source>Success</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="279"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="267"/>
         <source>Successfully promoted user.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="281"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="269"/>
         <source>Successfully demoted user.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="387"/>
-        <source>&amp;Invite to Game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="593"/>
-        <source>Join my game (#%1):</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="594"/>
-        <source>Join my game &quot;%1&quot; (#%2):</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="645"/>
-        <source>Ignore list</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="646"/>
-        <source>%1 has been added to your ignore list.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="662"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="479"/>
         <source>Kick Player</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="663"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="480"/>
         <source>Are you sure you want to kick this player from the game?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="261"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="286"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="288"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="249"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="274"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="276"/>
         <source>Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="286"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="274"/>
         <source>Failed to promote user.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="288"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="276"/>
         <source>Failed to demote user.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="376"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="363"/>
         <source>Copy hash to clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="410"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="383"/>
         <source>Remove this user&apos;s messages</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13314,61 +9861,61 @@ Please refrain from engaging in this activity or further actions may be taken ag
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="128"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="126"/>
         <source>Moderator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="130"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="128"/>
         <source>Registered user</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="132"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="145"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="130"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="143"/>
         <source>Unregistered user</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="136"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="134"/>
         <source>Judge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="155"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="153"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="374"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="371"/>
         <source>The entered password does not match your account.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="355"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="367"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="388"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="412"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="352"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="364"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="385"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="409"/>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="367"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="364"/>
         <source>User information updated.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="274"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="351"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="370"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="374"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="378"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="272"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="348"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="367"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="371"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="375"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="388"/>
         <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="391"/>
         <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="394"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="397"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="401"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="415"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="419"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="398"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="412"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="416"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13392,13 +9939,8 @@ Please refrain from engaging in this activity or further actions may be taken ag
         <source>Edit Banner Card</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="126"/>
-        <source>Developer</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="175"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="173"/>
         <source>%n Year(s), </source>
         <comment>amount of years (only shown if more than 0)</comment>
         <translation type="unfinished">
@@ -13407,7 +9949,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="178"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="176"/>
         <source>%10%n Day(s) %20</source>
         <comment>amount of years (if more than 0), amount of days, date in local short format</comment>
         <translation type="unfinished">
@@ -13416,274 +9958,270 @@ Please refrain from engaging in this activity or further actions may be taken ag
         </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="235"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="233"/>
         <source>Enter Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="236"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="234"/>
         <source>Password verification is required in order to change your email address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="275"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="379"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="402"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="273"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="376"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="399"/>
         <source>An error occurred while trying to update your user information.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="352"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="349"/>
         <source>The selected card is blacklisted on this server or another error occurred.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="356"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="353"/>
         <source>Banner card removed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="356"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="353"/>
         <source>Banner card updated.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="371"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="368"/>
         <source>This server does not permit you to update your user informations.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="388"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="385"/>
         <source>Password changed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="391"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="388"/>
         <source>This server does not permit you to change your password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="394"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="391"/>
         <source>The new password is too short.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="397"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="394"/>
         <source>The old password is incorrect.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="412"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="409"/>
         <source>Avatar updated.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="415"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="412"/>
         <source>This server does not permit you to update your avatar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="419"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="416"/>
         <source>An error occured while trying to update your avatar.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="368"/>
+        <source>This server does not permit you to update your user informations.</source>
+        <oldsource>An error occured while trying to updater your avatar.</oldsource>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>UserInfoPopup</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="390"/>
-        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="528"/>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="300"/>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="406"/>
         <source>Games</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="519"/>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="397"/>
         <source>Chat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="519"/>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="397"/>
         <source>Open private chat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="524"/>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="402"/>
         <source>Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="524"/>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="402"/>
         <source>View user profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="528"/>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="406"/>
         <source>Show this user&apos;s games</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="535"/>
-        <source>Invite</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="535"/>
-        <source>Invite to your game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="543"/>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="414"/>
         <source>− Buddy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="543"/>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="414"/>
         <source>Remove from buddy list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="547"/>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="418"/>
         <source>+ Buddy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="547"/>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="418"/>
         <source>Add to buddy list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="552"/>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="423"/>
         <source>− Ignore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="552"/>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="423"/>
         <source>Remove from ignore list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="556"/>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="427"/>
         <source>+ Ignore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="556"/>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="427"/>
         <source>Add to ignore list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="569"/>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="440"/>
         <source>Ban</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="569"/>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="440"/>
         <source>Ban from server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="570"/>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="441"/>
         <source>Warn</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="570"/>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="441"/>
         <source>Warn user</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="571"/>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="442"/>
         <source>Ban log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="571"/>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="442"/>
         <source>View ban history</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="572"/>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="443"/>
         <source>Warn log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="572"/>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="443"/>
         <source>View warning history</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="585"/>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="456"/>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="585"/>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="456"/>
         <source>View admin notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="590"/>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="461"/>
         <source>− Mod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="590"/>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="461"/>
         <source>Demote from moderator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="594"/>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="465"/>
         <source>+ Mod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="594"/>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="465"/>
         <source>Promote to moderator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="599"/>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="470"/>
         <source>− Judge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="599"/>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="470"/>
         <source>Demote from judge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="603"/>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="474"/>
         <source>+ Judge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="603"/>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="474"/>
         <source>Promote to judge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="640"/>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="508"/>
         <source>Join game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="644"/>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="513"/>
         <source>Spectate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="695"/>
-        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="772"/>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="555"/>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="632"/>
         <source>Loading games…</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="733"/>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="593"/>
         <source>Could not load games.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="741"/>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="601"/>
         <source>No active games.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13691,344 +10229,223 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserInterfaceSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="347"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="209"/>
         <source>General interface settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="348"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="210"/>
         <source>&amp;Double-click cards to play them (instead of single-click)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="349"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="211"/>
         <source>&amp;Clicking plays all selected cards (instead of just the clicked card)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="350"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="212"/>
         <source>&amp;Play all nonlands onto the stack (not the battlefield) by default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="351"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="213"/>
         <source>Do not delete &amp;arrows inside of subphases</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="352"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="214"/>
         <source>Close card view window when last card is removed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="353"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="215"/>
         <source>Auto focus search bar when card view window is opened</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="354"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="216"/>
         <source>Annotate card text on tokens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="355"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="217"/>
         <source>Show selection count during drag selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="356"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="218"/>
         <source>Show total selection count</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="204"/>
-        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="400"/>
-        <source>Disabled</source>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="219"/>
+        <source>Show subtype breakdown in selection tally</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="206"/>
-        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="402"/>
-        <source>Enabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="208"/>
-        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="404"/>
-        <source>Automatic</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="227"/>
-        <source>CommanderSpellbook bracket names</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="229"/>
-        <source>Official Commander bracket names (approximate)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="357"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="220"/>
         <source>Use tear-off menus, allowing right click menus to persist on screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="359"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="222"/>
         <source>Keep game chat focused when clicking in game (Note: disables card view search bar)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="361"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="224"/>
         <source>Notifications settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="362"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="225"/>
         <source>Enable notifications in taskbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="363"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="226"/>
         <source>Notify in the taskbar for game events while you are spectating</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="364"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="227"/>
         <source>Notify in the taskbar when users in your buddy list connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="366"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="228"/>
         <source>Animation settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="367"/>
-        <source>&amp;Enable all animations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="368"/>
-        <source>&amp;Disable all animations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="369"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="229"/>
         <source>&amp;Tap/untap animation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="370"/>
-        <source>&amp;Arrow draw animation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="371"/>
-        <source>Life counter flash</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="372"/>
-        <source>Battlefield flash on damage</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="374"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="230"/>
         <source>Deck editor/storage settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="375"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="231"/>
         <source>Open deck in new tab by default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="376"/>
-        <source>Show card counts in Visual Deck Editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="377"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="232"/>
         <source>Use visual deck storage in game lobby</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="378"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="233"/>
         <source>Use selection animation for Visual Deck Storage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="380"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="235"/>
         <source>When adding a tag in the visual deck storage to a .txt deck:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="382"/>
-        <source>Do nothing</source>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="237"/>
+        <source>do nothing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="384"/>
-        <source>Ask to convert to .cod</source>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="239"/>
+        <source>ask to convert to .cod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="386"/>
-        <source>Always convert to .cod</source>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="241"/>
+        <source>always convert to .cod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="387"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="242"/>
         <source>Default deck editor type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="388"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="243"/>
         <source>Classic Deck Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="389"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="244"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="390"/>
-        <source>Visual deck editor startup tab</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="391"/>
-        <source>Context</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="392"/>
-        <source>Deck display</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="393"/>
-        <source>Database display</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="395"/>
-        <source>Context mode: New decks open on the database display, existing decks open on the deck view.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="398"/>
-        <source>CommanderSpellbook integration to estimate commander bracket</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="405"/>
-        <source>Bracket naming</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="412"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="245"/>
         <source>Replay settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="413"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="246"/>
         <source>Buffer time for backwards skip via shortcut:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>UserListPanelWidget</name>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_list_panel_widget.cpp" line="81"/>
-        <source>Search users...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>UserListWidget</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="965"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="865"/>
         <source>Users connected to server: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="968"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="868"/>
         <source>Users in this room: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="971"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="871"/>
         <source>Buddies online: %1 / %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="974"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="874"/>
         <source>Ignored users online: %1 / %2</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="1473"/>
-        <source>Buddies</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="1475"/>
-        <source>Online</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="1477"/>
-        <source>Ignored</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="1506"/>
-        <source>%1 %2 (%3/%4)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="1508"/>
-        <source>%1 %2 (%3)</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>UtilityMenu</name>
     <message>
-        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="114"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="113"/>
         <source>Increment all card counters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="115"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="114"/>
         <source>&amp;Untap all permanents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="116"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="115"/>
         <source>R&amp;oll die...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="117"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="116"/>
         <source>Flip coin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="118"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="117"/>
         <source>&amp;Create token...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="119"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="118"/>
         <source>C&amp;reate another token</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="120"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="119"/>
         <source>Cr&amp;eate predefined token</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14065,22 +10482,22 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDatabaseDisplayFilterSaveLoadWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="52"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="51"/>
         <source>Search filter...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="53"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="52"/>
         <source>Save Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="54"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="53"/>
         <source>Save all currently applied filters to a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="55"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="54"/>
         <source>Enter filename...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14088,72 +10505,72 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDatabaseDisplayFilterToolbarWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="142"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="144"/>
         <source>Sort by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="143"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="145"/>
         <source>Filter by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="145"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="147"/>
         <source>Save and load filters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="146"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="148"/>
         <source>Filter by exact card name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="147"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="149"/>
         <source>Filter by card main-type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="148"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="150"/>
         <source>Filter by card sub-type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="149"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="151"/>
         <source>Filter by set</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="150"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="152"/>
         <source>Filter by format legality</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="152"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="154"/>
         <source>Save/Load</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="153"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="155"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="154"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="156"/>
         <source>Main Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="155"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="157"/>
         <source>Sub Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="156"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="158"/>
         <source>Sets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="157"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="159"/>
         <source>Formats</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14255,7 +10672,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDatabaseDisplayRecentSetFilterSettingsWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="47"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="44"/>
         <source>Filter to most recent sets</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14263,19 +10680,19 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDatabaseDisplaySetFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="61"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="58"/>
         <source>Search sets...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="93"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="263"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="88"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="257"/>
         <source>Mode: Exact Match</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="93"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="263"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="88"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="257"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14321,28 +10738,28 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDatabaseDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="78"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="62"/>
         <source>Search by card name (or search expressions)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="87"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="257"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="71"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="200"/>
         <source>Visual</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="231"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="174"/>
         <source>Loading database ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="232"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="175"/>
         <source>Clear all filters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="250"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="193"/>
         <source>Table</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14350,43 +10767,43 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDeckDisplayOptionsWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="90"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
         <source>Group by:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="91"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="90"/>
         <source>Change how cards are divided into categories/groups.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="92"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="91"/>
         <source>Sort by:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="93"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="92"/>
         <source>Click and drag to change the sort order within the groups</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="94"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="93"/>
         <source>Configure how cards are sorted within their groups</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="95"/>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="124"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="94"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="123"/>
         <source>Toggle Layout: Overlap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="98"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="97"/>
         <source>Change how cards are displayed within zones (i.e. overlapped or fully visible.)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="120"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="119"/>
         <source>Toggle Layout: Flat</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14402,12 +10819,12 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDeckEditorSampleHandWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="73"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="71"/>
         <source>Draw a new sample hand</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="74"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="72"/>
         <source>Sample hand size</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14415,17 +10832,17 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDeckEditorWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="208"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="216"/>
         <source>Type a card name here for suggestions from the database...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="209"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="217"/>
         <source>Quick search and add card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="210"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="218"/>
         <source>Search for closest match in the database (with auto-suggestions) and add preferred printing to the deck on pressing enter</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14433,7 +10850,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDeckStorageFolderDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="34"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="45"/>
         <source>Deck Storage</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14441,57 +10858,52 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDeckStorageQuickSettingsWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="154"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="129"/>
         <source>Show Folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="155"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="130"/>
         <source>Show Tag Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="156"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="131"/>
         <source>Show Color Identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="157"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="132"/>
         <source>Show Tags On Deck Previews</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="158"/>
-        <source>Show Upload Time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="159"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="133"/>
         <source>Show Banner Card Selection Option</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="160"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="134"/>
         <source>Draw unused Color Identities</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="161"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="135"/>
         <source>Unused Color Identities Opacity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="164"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="138"/>
         <source>Deck tooltip:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="165"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="139"/>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="166"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="140"/>
         <source>Filepath</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14499,7 +10911,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDeckStorageSearchWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp" line="24"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp" line="26"/>
         <source>Search by filename (or search expression)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14507,22 +10919,22 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDeckStorageSortWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="39"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
         <source>Sort Alphabetically (Deck Name)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="41"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
         <source>Sort Alphabetically (Filename)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="43"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="51"/>
         <source>Sort by Last Modified</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="45"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="52"/>
         <source>Sort by Last Loaded</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14530,22 +10942,17 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDeckStorageWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="173"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="118"/>
         <source>Loading database ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="175"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="120"/>
         <source>Refresh loaded files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="176"/>
-        <source>Select decks to share</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="177"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
         <source>Visual Deck Storage Settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14553,202 +10960,177 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>WarningDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_dialog.cpp" line="118"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="137"/>
         <source>Which warning would you like to send?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_dialog.cpp" line="126"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="145"/>
         <source>Redact all messages from this user in all rooms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_dialog.cpp" line="128"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="147"/>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_dialog.cpp" line="131"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="150"/>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_dialog.cpp" line="146"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="165"/>
         <source>Warn user for misconduct</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_dialog.cpp" line="152"/>
-        <location filename="src/interface/widgets/server/user/user_list_dialog.cpp" line="158"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="171"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="177"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_dialog.cpp" line="153"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="172"/>
         <source>User name to send a warning to can not be blank, please specify a user to warn.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_dialog.cpp" line="159"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="178"/>
         <source>Warning to use can not be blank, please select a valid warning to send.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_list_dialog.cpp" line="189"/>
-        <source>%1 (IL %2)</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>WelcomePage</name>
-    <message>
-        <location filename="src/interface/widgets/onboarding/pages/welcome_page.cpp" line="69"/>
-        <source>Welcome!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/onboarding/pages/welcome_page.cpp" line="74"/>
-        <source>Let&apos;s get you set up. This will only take a minute — we&apos;ll grab the card database, pick a look you like, and get you ready to connect to a server.
-
-You can change any of this later from Settings.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/onboarding/pages/welcome_page.cpp" line="78"/>
-        <source>Language:</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>WndSets</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="40"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="36"/>
         <source>Move selected set to the top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="47"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="43"/>
         <source>Move selected set up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="54"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="50"/>
         <source>Move selected set down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="61"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="57"/>
         <source>Move selected set to the bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="74"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="65"/>
+        <source>Search by set name, code, or type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="70"/>
         <source>Default order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="75"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="71"/>
         <source>Restore original art priority order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="111"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="107"/>
         <source>Enable all sets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="112"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="108"/>
         <source>Disable all sets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="113"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="109"/>
         <source>Enable selected set(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="114"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="110"/>
         <source>Disable selected set(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="130"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="126"/>
         <source>Deck Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="130"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="126"/>
         <source>Use CTRL+A to select all sets in the view.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="131"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="127"/>
         <source>Only cards in enabled sets will appear in the card list of the deck editor.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="132"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="128"/>
         <source>Image priority is decided in the following order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="133"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="129"/>
         <source>first the CUSTOM Folder (%1), then the Enabled Sets in this dialog (Top to Bottom)</source>
         <comment>%1 is a link to the wiki</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="162"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="158"/>
         <source>Include cards rebalanced for Alchemy [requires restart]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="132"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="128"/>
         <source>Card Art</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="69"/>
-        <source>Search by set name, code, type, or release date</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="137"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="133"/>
         <source>How to use custom card art</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="141"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="137"/>
         <source>Hints</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="144"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="140"/>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="148"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="144"/>
         <source>Sorting by column allows you to find a set while not changing set priority.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="149"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="145"/>
         <source>To enable ordering again, click the column header until this message disappears.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="152"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="148"/>
         <source>Use the current sorting as the set priority instead</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="153"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="149"/>
         <source>Sorts the set priority using the same column</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="192"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="188"/>
         <source>Manage sets</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14756,85 +11138,93 @@ You can change any of this later from Settings.</source>
 <context>
     <name>ZoneViewWidget</name>
     <message>
-        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="63"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="61"/>
         <source>Search by card name (or search expressions)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="242"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="234"/>
         <source>Ungrouped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="243"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="235"/>
         <source>Group by Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="244"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="236"/>
         <source>Group by Mana Value</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="245"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="237"/>
         <source>Group by Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="252"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="244"/>
         <source>Unsorted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="253"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="245"/>
         <source>Sort by Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="254"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="246"/>
         <source>Sort by Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="255"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="247"/>
         <source>Sort by Mana Cost</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="256"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="248"/>
         <source>Sort by Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="257"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="249"/>
         <source>Sort by P/T</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="258"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="250"/>
         <source>Sort by Set</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="262"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="254"/>
         <source>shuffle when closing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="263"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="255"/>
         <source>pile view</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>i18n</name>
+    <message>
+        <location filename="src/client/settings/cache_settings.cpp" line="187"/>
+        <source>English</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>main</name>
     <message>
-        <location filename="src/main.cpp" line="258"/>
+        <location filename="src/main.cpp" line="232"/>
         <source>Connect on startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/main.cpp" line="259"/>
+        <location filename="src/main.cpp" line="233"/>
         <source>Debug to file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15618,16 +12008,6 @@ You can change any of this later from Settings.</source>
         <source>Graveyard</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="790"/>
-        <source>Report Queue</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="792"/>
-        <source>Moderation</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="76"/>
         <location filename="src/client/settings/shortcuts_settings.h" line="573"/>
diff --git a/cockatrice/src/client/lag_monitor.cpp b/cockatrice/src/client/lag_monitor.cpp
index 6b72087ec..383d64644 100644
--- a/cockatrice/src/client/lag_monitor.cpp
+++ b/cockatrice/src/client/lag_monitor.cpp
@@ -1,10 +1,7 @@
 #include "lag_monitor.h"
 
-#include <QApplication>
 #include <QCoreApplication>
-#include <QDateTime>
 #include <QEvent>
-#include <QMessageLogger>
 #include <QTimer>
 
 LagMonitor::LagMonitor(QObject *parent) : QObject(parent)
diff --git a/cockatrice/src/client/lag_monitor.h b/cockatrice/src/client/lag_monitor.h
index 0bb98c25e..9fdf6b283 100644
--- a/cockatrice/src/client/lag_monitor.h
+++ b/cockatrice/src/client/lag_monitor.h
@@ -6,15 +6,15 @@
 #ifndef LAG_MONITOR_H
 #define LAG_MONITOR_H
 
+#include <QDateTime>
 #include <QElapsedTimer>
 #include <QList>
 #include <QLoggingCategory>
 #include <QObject>
-#include <QtGlobal>
-#include <qtmetamacros.h>
 
 inline Q_LOGGING_CATEGORY(LagMonitorLog, "lag_monitor");
 
+class QEvent;
 class QTimer;
 
 /**
diff --git a/cockatrice/src/client/latency_graph_widget.cpp b/cockatrice/src/client/latency_graph_widget.cpp
index 72df3ce6c..46d6ccdd3 100644
--- a/cockatrice/src/client/latency_graph_widget.cpp
+++ b/cockatrice/src/client/latency_graph_widget.cpp
@@ -5,11 +5,7 @@
 
 #include "latency_graph_widget.h"
 
-#include <QColor>
 #include <QPainter>
-#include <QRectF>
-#include <QtGlobal>
-#include <qnumeric.h>
 
 LatencyGraphWidget::LatencyGraphWidget(QWidget *parent) : QWidget(parent)
 {
diff --git a/cockatrice/src/client/latency_graph_widget.h b/cockatrice/src/client/latency_graph_widget.h
index 31a7022b2..4f6f38f8b 100644
--- a/cockatrice/src/client/latency_graph_widget.h
+++ b/cockatrice/src/client/latency_graph_widget.h
@@ -8,8 +8,6 @@
 
 #include <QList>
 #include <QWidget>
-#include <QtGlobal>
-#include <qtmetamacros.h>
 
 /**
  * @brief Bar graph of recent network round-trip samples.
diff --git a/cockatrice/src/client/latency_status_widget.cpp b/cockatrice/src/client/latency_status_widget.cpp
index 940074581..779c726eb 100644
--- a/cockatrice/src/client/latency_status_widget.cpp
+++ b/cockatrice/src/client/latency_status_widget.cpp
@@ -6,15 +6,11 @@
 #include "latency_status_widget.h"
 
 #include "latency_graph_widget.h"
-#include "latency_tracker.h"
 
 #include <QEvent>
 #include <QHBoxLayout>
 #include <QLabel>
-#include <QObject>
-#include <QPoint>
 #include <QVBoxLayout>
-#include <qnamespace.h>
 
 LatencyStatusWidget::LatencyStatusWidget(QWidget *parent) : QWidget(parent)
 {
diff --git a/cockatrice/src/client/latency_status_widget.h b/cockatrice/src/client/latency_status_widget.h
index 24d6fda4d..d9e1d130c 100644
--- a/cockatrice/src/client/latency_status_widget.h
+++ b/cockatrice/src/client/latency_status_widget.h
@@ -7,10 +7,8 @@
 #define LATENCY_STATUS_WIDGET_H
 
 #include <QList>
-#include <QString>
 #include <QWidget>
 #include <libcockatrice/network/client/abstract/latency_tracker.h>
-#include <qtmetamacros.h>
 
 class QLabel;
 class LatencyGraphWidget;
diff --git a/cockatrice/src/client/network/connection_controller/remote_connection_controller.cpp b/cockatrice/src/client/network/connection_controller/remote_connection_controller.cpp
index 7480da27e..c1598bd25 100644
--- a/cockatrice/src/client/network/connection_controller/remote_connection_controller.cpp
+++ b/cockatrice/src/client/network/connection_controller/remote_connection_controller.cpp
@@ -8,25 +8,14 @@
 #include "../interface/widgets/dialogs/dlg_forgot_password_reset.h"
 #include "../interface/widgets/dialogs/dlg_register.h"
 #include "../interface/widgets/utility/get_text_with_max.h"
-#include "libcockatrice/protocol/pb/event_connection_closed.pb.h"
-#include "libcockatrice/protocol/pb/event_server_shutdown.pb.h"
 
-#include <QChar>
 #include <QDateTime>
-#include <QDebug>
 #include <QLineEdit>
-#include <QList>
 #include <QMessageBox>
-#include <QPixmap>
-#include <QStringList>
-#include <QStringLiteral>
 #include <QThread>
 #include <libcockatrice/network/client/remote/remote_client.h>
 #include <libcockatrice/protocol/pb/response.pb.h>
 #include <libcockatrice/settings/servers_settings.h>
-#include <qnamespace.h>
-
-class QWidget;
 
 ConnectionController::ConnectionController(QWidget *dialogParent, QObject *parent)
     : QObject(parent), dialogParent(dialogParent)
diff --git a/cockatrice/src/client/network/connection_controller/remote_connection_controller.h b/cockatrice/src/client/network/connection_controller/remote_connection_controller.h
index d4a832c75..bae99a3e0 100644
--- a/cockatrice/src/client/network/connection_controller/remote_connection_controller.h
+++ b/cockatrice/src/client/network/connection_controller/remote_connection_controller.h
@@ -2,22 +2,17 @@
 #define COCKATRICE_REMOTE_CONNECTION_CONTROLLER_H
 
 #include "abstract_client.h"
-#include "latency_tracker.h"
 
 #include <QMessageBox>
 #include <QObject>
 #include <QString>
-#include <QtGlobal>
-#include <qtmetamacros.h>
+#include <QThread>
+#include <libcockatrice/protocol/pb/event_connection_closed.pb.h>
+#include <libcockatrice/protocol/pb/event_server_shutdown.pb.h>
 
 class RemoteClient;
 class ServerInfo_User;
 class DlgConnect;
-class Event_ConnectionClosed;
-class Event_ServerShutdown;
-class QThread;
-class QWidget;
-template <typename T> class QList;
 
 /**
  * Owns the RemoteClient and its worker thread.
diff --git a/cockatrice/src/client/network/interfaces/deck_stats_interface.cpp b/cockatrice/src/client/network/interfaces/deck_stats_interface.cpp
index d5cfdbbc9..42292b2aa 100644
--- a/cockatrice/src/client/network/interfaces/deck_stats_interface.cpp
+++ b/cockatrice/src/client/network/interfaces/deck_stats_interface.cpp
@@ -1,22 +1,11 @@
 #include "deck_stats_interface.h"
 
-#include "libcockatrice/card/card_info.h"
-#include "libcockatrice/card/database/card_database_querier.h"
-#include "libcockatrice/deck_list/tree/inner_deck_list_node.h"
-
-#include <QByteArray>
 #include <QDesktopServices>
 #include <QMessageBox>
-#include <QNetworkAccessManager>
 #include <QNetworkReply>
 #include <QNetworkRequest>
 #include <QRegularExpression>
-#include <QRegularExpressionMatch>
-#include <QSharedPointer>
-#include <QString>
-#include <QUrl>
 #include <QUrlQuery>
-#include <functional>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/deck_list/deck_list.h>
 #include <libcockatrice/deck_list/tree/deck_list_card_node.h>
diff --git a/cockatrice/src/client/network/interfaces/deck_stats_interface.h b/cockatrice/src/client/network/interfaces/deck_stats_interface.h
index e7791075c..09bf998de 100644
--- a/cockatrice/src/client/network/interfaces/deck_stats_interface.h
+++ b/cockatrice/src/client/network/interfaces/deck_stats_interface.h
@@ -7,8 +7,7 @@
 #ifndef DECKSTATS_INTERFACE_H
 #define DECKSTATS_INTERFACE_H
 
-#include <QObject>
-#include <qtmetamacros.h>
+#include <libcockatrice/deck_list/deck_list.h>
 
 class QByteArray;
 class QNetworkAccessManager;
diff --git a/cockatrice/src/client/network/interfaces/tapped_out_interface.cpp b/cockatrice/src/client/network/interfaces/tapped_out_interface.cpp
index 30044c2b6..627b7fe34 100644
--- a/cockatrice/src/client/network/interfaces/tapped_out_interface.cpp
+++ b/cockatrice/src/client/network/interfaces/tapped_out_interface.cpp
@@ -1,28 +1,11 @@
 #include "tapped_out_interface.h"
 
-#include "libcockatrice/card/card_info.h"
-#include "libcockatrice/card/database/card_database_querier.h"
-#include "libcockatrice/deck_list/tree/inner_deck_list_node.h"
-
-#include <QByteArray>
-#include <QDebug>
 #include <QDesktopServices>
-#include <QList>
 #include <QMessageBox>
-#include <QMessageLogger>
-#include <QNetworkAccessManager>
 #include <QNetworkReply>
 #include <QNetworkRequest>
 #include <QRegularExpression>
-#include <QRegularExpressionMatch>
-#include <QRegularExpressionMatchIterator>
-#include <QSharedPointer>
-#include <QString>
-#include <QStringList>
-#include <QUrl>
 #include <QUrlQuery>
-#include <QVariant>
-#include <functional>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/deck_list/deck_list.h>
 #include <libcockatrice/deck_list/tree/deck_list_card_node.h>
diff --git a/cockatrice/src/client/network/interfaces/tapped_out_interface.h b/cockatrice/src/client/network/interfaces/tapped_out_interface.h
index 615991b07..32f9369d5 100644
--- a/cockatrice/src/client/network/interfaces/tapped_out_interface.h
+++ b/cockatrice/src/client/network/interfaces/tapped_out_interface.h
@@ -9,7 +9,6 @@
 
 #include <QLoggingCategory>
 #include <QObject>
-#include <qtmetamacros.h>
 
 inline Q_LOGGING_CATEGORY(TappedOutInterfaceLog, "tapped_out_interface");
 
diff --git a/cockatrice/src/client/network/parsers/deck_link_to_api_transformer.cpp b/cockatrice/src/client/network/parsers/deck_link_to_api_transformer.cpp
index 7127b0a29..010b63684 100644
--- a/cockatrice/src/client/network/parsers/deck_link_to_api_transformer.cpp
+++ b/cockatrice/src/client/network/parsers/deck_link_to_api_transformer.cpp
@@ -1,7 +1,6 @@
 #include "deck_link_to_api_transformer.h"
 
 #include <QRegularExpression>
-#include <QRegularExpressionMatch>
 
 namespace DeckLinkToApiTransformer
 {
diff --git a/cockatrice/src/client/network/update/card_spoiler/spoiler_background_updater.cpp b/cockatrice/src/client/network/update/card_spoiler/spoiler_background_updater.cpp
index 192029b23..dae633717 100644
--- a/cockatrice/src/client/network/update/card_spoiler/spoiler_background_updater.cpp
+++ b/cockatrice/src/client/network/update/card_spoiler/spoiler_background_updater.cpp
@@ -1,36 +1,21 @@
 #include "spoiler_background_updater.h"
 
+#include "../../../../interface/window_main.h"
 #include "../../../../main.h"
 #include "../../../settings/cache_settings.h"
 
-#include <QChar>
 #include <QCryptographicHash>
 #include <QDateTime>
 #include <QDebug>
-#include <QDir>
 #include <QFile>
-#include <QFileInfo>
-#include <QFutureWatcher>
-#include <QIODevice>
-#include <QList>
 #include <QLocale>
-#include <QMessageLogger>
-#include <QNetworkAccessManager>
 #include <QNetworkReply>
-#include <QNetworkRequest>
-#include <QSharedPointer>
-#include <QSystemTrayIcon>
-#include <QTimeZone>
 #include <QUrl>
-#include <QtConcurrentRun>
-#include <QtGlobal>
-#include <functional>
+#include <QtConcurrent>
 #include <libcockatrice/card/database/card_database.h>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/settings/download_settings.h>
 #include <libcockatrice/settings/paths_settings.h>
-#include <tuple>
-#include <utility>
 #include <version_string.h>
 
 #define SPOILERS_STATUS_URL "https://raw.githubusercontent.com/Cockatrice/Magic-Spoiler/files/SpoilerSeasonEnabled"
@@ -178,15 +163,7 @@ bool SpoilerBackgroundUpdater::saveDownloadedFile(QByteArray data)
 
     // Data written, so reload the card database
     qCInfo(SpoilerBackgroundUpdaterLog) << "Spoiler Service Data Written";
-    // Spoilers can introduce sets the config has never seen; the loader never
-    // runs checkUnknownSets() itself, so run it once the finished snapshot has
-    // been swapped in.
-    auto *watcher = new QFutureWatcher<void>(this);
-    connect(watcher, &QFutureWatcher<void>::finished, this, [watcher] {
-        watcher->deleteLater();
-        CardDatabaseManager::getInstance()->checkUnknownSets();
-    });
-    watcher->setFuture(QtConcurrent::run([] { CardDatabaseManager::getInstance()->loadCardDatabases(); }));
+    const auto reloadOk = QtConcurrent::run([] { CardDatabaseManager::getInstance()->loadCardDatabases(); });
 
     // If the user has notifications enabled, let them know
     // when the database was last updated
diff --git a/cockatrice/src/client/network/update/card_spoiler/spoiler_background_updater.h b/cockatrice/src/client/network/update/card_spoiler/spoiler_background_updater.h
index a6c4ed00f..03d4897a2 100644
--- a/cockatrice/src/client/network/update/card_spoiler/spoiler_background_updater.h
+++ b/cockatrice/src/client/network/update/card_spoiler/spoiler_background_updater.h
@@ -10,11 +10,7 @@
 #include <QByteArray>
 #include <QLoggingCategory>
 #include <QObject>
-#include <QString>
-#include <qtmetamacros.h>
-
-class QProcess;
-class QUrl;
+#include <QProcess>
 
 inline Q_LOGGING_CATEGORY(SpoilerBackgroundUpdaterLog, "spoiler_background_updater");
 
diff --git a/cockatrice/src/client/network/update/client/client_update_checker.h b/cockatrice/src/client/network/update/client/client_update_checker.h
index 16cbd0369..1a89de533 100644
--- a/cockatrice/src/client/network/update/client/client_update_checker.h
+++ b/cockatrice/src/client/network/update/client/client_update_checker.h
@@ -6,12 +6,9 @@
 
 #ifndef CLIENT_UPDATE_CHECKER_H
 #define CLIENT_UPDATE_CHECKER_H
-#include "release_channel.h"
-
-#include <QMetaObject>
 #include <QObject>
-#include <QString>
-#include <qtmetamacros.h>
+
+class Release;
 
 /**
  * We use a singleton instance of UpdateChannel, which can cause interference and feedback loops when multiple objects
diff --git a/cockatrice/src/client/network/update/client/release_channel.cpp b/cockatrice/src/client/network/update/client/release_channel.cpp
index 45c503623..f401dfd00 100644
--- a/cockatrice/src/client/network/update/client/release_channel.cpp
+++ b/cockatrice/src/client/network/update/client/release_channel.cpp
@@ -2,27 +2,15 @@
 
 #include "version_string.h"
 
-#include <QByteArray>
-#include <QDebug>
 #include <QJsonArray>
 #include <QJsonDocument>
 #include <QJsonObject>
-#include <QJsonParseError>
-#include <QJsonValue>
-#include <QMap>
-#include <QMessageLogger>
-#include <QNetworkAccessManager>
+#include <QMessageBox>
 #include <QNetworkReply>
-#include <QNetworkRequest>
 #include <QRegularExpression>
-#include <QRegularExpressionMatch>
-#include <QUrl>
-#include <QVariant>
-#include <QVariantMap>
+#include <QSysInfo>
 #include <QtGlobal>
 #include <optional>
-#include <qnamespace.h>
-#include <qprocessordetection.h>
 
 #if defined(Q_OS_MACOS)
 #include <sys/sysctl.h>
diff --git a/cockatrice/src/client/network/update/client/release_channel.h b/cockatrice/src/client/network/update/client/release_channel.h
index 183a766ab..e038cb2f4 100644
--- a/cockatrice/src/client/network/update/client/release_channel.h
+++ b/cockatrice/src/client/network/update/client/release_channel.h
@@ -11,9 +11,8 @@
 #include <QLoggingCategory>
 #include <QObject>
 #include <QString>
-#include <QVariantList>
+#include <QVariantMap>
 #include <optional>
-#include <qtmetamacros.h>
 #include <utility>
 
 inline Q_LOGGING_CATEGORY(ReleaseChannelLog, "release_channel");
diff --git a/cockatrice/src/client/network/update/client/update_downloader.cpp b/cockatrice/src/client/network/update/client/update_downloader.cpp
index c86972d60..a71bcf8f8 100644
--- a/cockatrice/src/client/network/update/client/update_downloader.cpp
+++ b/cockatrice/src/client/network/update/client/update_downloader.cpp
@@ -1,14 +1,6 @@
 #include "update_downloader.h"
 
-#include <QByteArray>
-#include <QChar>
-#include <QDir>
-#include <QFile>
-#include <QIODevice>
-#include <QNetworkAccessManager>
-#include <QNetworkRequest>
 #include <QUrl>
-#include <QVariant>
 
 UpdateDownloader::UpdateDownloader(QObject *parent) : QObject(parent), response(nullptr)
 {
diff --git a/cockatrice/src/client/network/update/client/update_downloader.h b/cockatrice/src/client/network/update/client/update_downloader.h
index 8aeefb22a..9a0caccbc 100644
--- a/cockatrice/src/client/network/update/client/update_downloader.h
+++ b/cockatrice/src/client/network/update/client/update_downloader.h
@@ -7,14 +7,8 @@
 #ifndef COCKATRICE_UPDATEDOWNLOADER_H
 #define COCKATRICE_UPDATEDOWNLOADER_H
 
-#include <QNetworkReply>
 #include <QObject>
-#include <QString>
-#include <QUrl>
-#include <QtGlobal>
-#include <qtmetamacros.h>
-
-class QNetworkAccessManager;
+#include <QtNetwork>
 
 class UpdateDownloader : public QObject
 {
diff --git a/cockatrice/src/client/settings/cache_settings.cpp b/cockatrice/src/client/settings/cache_settings.cpp
index 08eccf1e4..0f8693f2d 100644
--- a/cockatrice/src/client/settings/cache_settings.cpp
+++ b/cockatrice/src/client/settings/cache_settings.cpp
@@ -2,20 +2,15 @@
 
 #include "../network/update/client/release_channel.h"
 #include "card_counter_settings.h"
-#include "libcockatrice/interfaces/interface_card_database_path_provider.h"
 #include "shortcuts_settings.h"
+#include "version_string.h"
 
-#include <QApplication>
 #include <QDebug>
 #include <QDir>
 #include <QFile>
 #include <QGlobalStatic>
-#include <QMessageLogger>
 #include <QSettings>
-#include <QSharedPointer>
 #include <QStandardPaths>
-#include <QVariant>
-#include <QtGlobal>
 #include <libcockatrice/settings/appearance_settings.h>
 #include <libcockatrice/settings/cache_storage_settings.h>
 #include <libcockatrice/settings/card_database_settings.h>
@@ -133,10 +128,6 @@ SettingsCache::SettingsCache()
     // Migrate settings from global.ini to per-class INI files (runs at most once)
     SettingsMigration::migrateSettingsFromGlobalIni(settingsPath);
 
-    // Repair gamefilters.ini keys renamed to camelCase by #7084 for profiles that migrated
-    // before that rename (idempotent, safe to run on every startup, portable builds included).
-    SettingsMigration::migrateGameFiltersToCamelCase(settingsPath);
-
     shortcutsSettings = new ShortcutsSettings(settingsPath, this);
     cardDatabaseSettings = new CardDatabaseSettings(settingsPath, this);
     serversSettings = new ServersSettings(settingsPath, this);
diff --git a/cockatrice/src/client/settings/cache_settings.h b/cockatrice/src/client/settings/cache_settings.h
index 5f699247d..7a90d82f1 100644
--- a/cockatrice/src/client/settings/cache_settings.h
+++ b/cockatrice/src/client/settings/cache_settings.h
@@ -7,13 +7,11 @@
 #ifndef SETTINGSCACHE_H
 #define SETTINGSCACHE_H
 
-#include <QList>
 #include <QLoggingCategory>
-#include <QString>
 #include <QStringList>
 #include <libcockatrice/interfaces/interface_card_database_path_provider.h>
 #include <libcockatrice/interfaces/interface_network_settings_provider.h>
-#include <qtmetamacros.h>
+#include <libcockatrice/utility/macros.h>
 
 inline Q_LOGGING_CATEGORY(SettingsCacheLog, "settings_cache");
 
diff --git a/cockatrice/src/client/settings/card_counter_settings.cpp b/cockatrice/src/client/settings/card_counter_settings.cpp
index 4bdd581b5..d4030c174 100644
--- a/cockatrice/src/client/settings/card_counter_settings.cpp
+++ b/cockatrice/src/client/settings/card_counter_settings.cpp
@@ -1,15 +1,8 @@
 #include "card_counter_settings.h"
 
-#include "libcockatrice/settings/settings_manager.h"
-
-#include <QChar>
 #include <QColor>
 #include <QSettings>
-#include <QVariant>
 #include <QtMath>
-#include <iterator>
-
-class QObject;
 
 CardCounterSettings::CardCounterSettings(const QString &settingsPath, QObject *parent)
     : SettingsManager(settingsPath + "card_counters.ini", "cards", "counters", parent)
diff --git a/cockatrice/src/client/settings/card_counter_settings.h b/cockatrice/src/client/settings/card_counter_settings.h
index e5ca0a9bb..2ac658177 100644
--- a/cockatrice/src/client/settings/card_counter_settings.h
+++ b/cockatrice/src/client/settings/card_counter_settings.h
@@ -7,12 +7,10 @@
 #ifndef CARD_COUNTER_SETTINGS_H
 #define CARD_COUNTER_SETTINGS_H
 
-#include <QString>
 #include <libcockatrice/settings/settings_manager.h>
-#include <qtmetamacros.h>
 
+class QSettings;
 class QColor;
-class QObject;
 
 class CardCounterSettings : public SettingsManager
 {
diff --git a/cockatrice/src/client/settings/shortcut_treeview.cpp b/cockatrice/src/client/settings/shortcut_treeview.cpp
index 4a5bafb01..b909d47ac 100644
--- a/cockatrice/src/client/settings/shortcut_treeview.cpp
+++ b/cockatrice/src/client/settings/shortcut_treeview.cpp
@@ -3,24 +3,7 @@
 #include "cache_settings.h"
 #include "shortcuts_settings.h"
 
-#include <QAbstractItemModel>
-#include <QAbstractItemView>
-#include <QFont>
-#include <QHash>
 #include <QHeaderView>
-#include <QList>
-#include <QModelIndex>
-#include <QRegularExpression>
-#include <QSharedPointer>
-#include <QStandardItem>
-#include <QStandardItemModel>
-#include <QStringList>
-#include <QVariant>
-#include <algorithm>
-#include <qnamespace.h>
-
-class QObject;
-class QWidget;
 
 ShortcutFilterProxyModel::ShortcutFilterProxyModel(QObject *parent) : QSortFilterProxyModel(parent)
 {
diff --git a/cockatrice/src/client/settings/shortcut_treeview.h b/cockatrice/src/client/settings/shortcut_treeview.h
index 53f3fa0ef..afaf7e7ed 100644
--- a/cockatrice/src/client/settings/shortcut_treeview.h
+++ b/cockatrice/src/client/settings/shortcut_treeview.h
@@ -8,13 +8,8 @@
 #define SHORTCUT_TREEVIEW_H
 
 #include <QSortFilterProxyModel>
-#include <QString>
+#include <QStandardItemModel>
 #include <QTreeView>
-#include <qtmetamacros.h>
-
-class QObject;
-class QStandardItemModel;
-class QWidget;
 
 /**
  * Custom implementation of QSortFilterProxyModel that appends the source and parent strings together when filtering
diff --git a/cockatrice/src/client/settings/shortcuts_settings.cpp b/cockatrice/src/client/settings/shortcuts_settings.cpp
index ffb4afcac..2ff65ab6f 100644
--- a/cockatrice/src/client/settings/shortcuts_settings.cpp
+++ b/cockatrice/src/client/settings/shortcuts_settings.cpp
@@ -2,13 +2,9 @@
 
 #include <QDebug>
 #include <QFile>
-#include <QMap>
 #include <QMessageBox>
-#include <QMessageLogger>
-#include <QSettings>
-#include <QSharedPointer>
 #include <QStringList>
-#include <QVariant>
+#include <utility>
 
 ShortcutKey::ShortcutKey(const QString &_name, QList<QKeySequence> _sequence, ShortcutGroup::Groups _group)
     : QList<QKeySequence>(_sequence), name(_name), group(_group)
diff --git a/cockatrice/src/client/settings/shortcuts_settings.h b/cockatrice/src/client/settings/shortcuts_settings.h
index 24790a407..f4ebc204e 100644
--- a/cockatrice/src/client/settings/shortcuts_settings.h
+++ b/cockatrice/src/client/settings/shortcuts_settings.h
@@ -8,18 +8,9 @@
 #define SHORTCUTSSETTINGS_H
 
 #include <QApplication>
-#include <QByteArray>
-#include <QChar>
-#include <QHash>
 #include <QKeySequence>
-#include <QList>
 #include <QLoggingCategory>
-#include <QObject>
-#include <QString>
-#include <QStringList>
-#include <QtGlobal>
-#include <qtmetamacros.h>
-#include <utility>
+#include <QSettings>
 
 inline Q_LOGGING_CATEGORY(ShortcutsSettingsLog, "shortcuts_settings");
 
diff --git a/cockatrice/src/client/sound_engine.cpp b/cockatrice/src/client/sound_engine.cpp
index 4ac142cf4..96cafa3d3 100644
--- a/cockatrice/src/client/sound_engine.cpp
+++ b/cockatrice/src/client/sound_engine.cpp
@@ -4,15 +4,8 @@
 
 #include <QApplication>
 #include <QAudioOutput>
-#include <QDebug>
 #include <QDir>
-#include <QFile>
-#include <QList>
 #include <QMediaPlayer>
-#include <QMessageLogger>
-#include <QStringList>
-#include <QUrl>
-#include <QtGlobal>
 #include <libcockatrice/settings/sound_settings.h>
 
 #define DEFAULT_THEME_NAME "Default"
diff --git a/cockatrice/src/client/sound_engine.h b/cockatrice/src/client/sound_engine.h
index 8167c71b5..0c201523a 100644
--- a/cockatrice/src/client/sound_engine.h
+++ b/cockatrice/src/client/sound_engine.h
@@ -7,17 +7,17 @@
 #ifndef SOUNDENGINE_H
 #define SOUNDENGINE_H
 
+#include <QAudioOutput>
 #include <QLoggingCategory>
 #include <QMap>
+#include <QMediaPlayer>
 #include <QObject>
 #include <QString>
-#include <qtmetamacros.h>
-
-class QAudioOutput;
-class QMediaPlayer;
 
 inline Q_LOGGING_CATEGORY(SoundEngineLog, "sound_engine");
 
+class QBuffer;
+
 typedef QMap<QString, QString> QStringMap;
 
 class SoundEngine : public QObject
diff --git a/cockatrice/src/database/interface/settings_card_preference_provider.h b/cockatrice/src/database/interface/settings_card_preference_provider.h
index 1feb2006b..64502e3a7 100644
--- a/cockatrice/src/database/interface/settings_card_preference_provider.h
+++ b/cockatrice/src/database/interface/settings_card_preference_provider.h
@@ -13,6 +13,11 @@ public:
     {
         return SettingsCache::instance().cardOverrides().getCardPreferenceOverride(cardName);
     }
+
+    [[nodiscard]] bool getIncludeRebalancedCards() const override
+    {
+        return SettingsCache::instance().cardsDisplay().getIncludeRebalancedCards();
+    }
 };
 
 #endif // COCKATRICE_SETTINGS_CARD_PREFERENCE_PROVIDER_H
diff --git a/cockatrice/src/filters/deck_filter_string.cpp b/cockatrice/src/filters/deck_filter_string.cpp
index 616311750..a2b7519a8 100644
--- a/cockatrice/src/filters/deck_filter_string.cpp
+++ b/cockatrice/src/filters/deck_filter_string.cpp
@@ -1,27 +1,9 @@
 #include "deck_filter_string.h"
 
-#include "../interface/deck_loader/loaded_deck.h"
-#include "libcockatrice/card/card_localization.h"
-#include "libcockatrice/card/database/card_database_querier.h"
-#include "libcockatrice/deck_list/deck_list.h"
-#include "libcockatrice/deck_list/tree/deck_list_card_node.h"
-
-#include <QByteArray>
-#include <QDebug>
 #include <QFileInfo>
-#include <QList>
-#include <QMessageLogger>
-#include <QSharedPointer>
-#include <algorithm>
-#include <any>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/filters/filter_string.h>
 #include <libcockatrice/utility/peglib.h>
-#include <mutex>
-#include <qnamespace.h>
-#include <stddef.h>
-#include <string>
-#include <vector>
 
 static peg::parser search(R"(
 Start <- QueryPartList
diff --git a/cockatrice/src/filters/deck_filter_string.h b/cockatrice/src/filters/deck_filter_string.h
index 76b891b59..5b1419004 100644
--- a/cockatrice/src/filters/deck_filter_string.h
+++ b/cockatrice/src/filters/deck_filter_string.h
@@ -7,14 +7,13 @@
 #ifndef DECK_FILTER_STRING_H
 #define DECK_FILTER_STRING_H
 
+#include "../interface/deck_loader/loaded_deck.h"
+
 #include <QLoggingCategory>
 #include <QString>
 #include <functional>
 #include <libcockatrice/card/card_localization.h>
 
-struct CardSearchLanguage;
-struct LoadedDeck;
-
 inline Q_LOGGING_CATEGORY(DeckFilterStringLog, "deck_filter_string");
 
 /**
diff --git a/cockatrice/src/filters/filter_builder.cpp b/cockatrice/src/filters/filter_builder.cpp
index 6cc893224..f109fbcd3 100644
--- a/cockatrice/src/filters/filter_builder.cpp
+++ b/cockatrice/src/filters/filter_builder.cpp
@@ -5,15 +5,8 @@
 
 #include <QComboBox>
 #include <QGridLayout>
-#include <QIcon>
 #include <QPushButton>
-#include <QSizePolicy>
-#include <QString>
-#include <QStringLiteral>
-#include <QVariant>
-#include <QtGlobal>
 #include <libcockatrice/filters/filter_card.h>
-#include <stddef.h>
 
 FilterBuilder::FilterBuilder(QWidget *parent) : QWidget(parent)
 {
diff --git a/cockatrice/src/filters/filter_builder.h b/cockatrice/src/filters/filter_builder.h
index 2aa38c992..98fe3fd02 100644
--- a/cockatrice/src/filters/filter_builder.h
+++ b/cockatrice/src/filters/filter_builder.h
@@ -8,8 +8,8 @@
 #define FILTERBUILDER_H
 
 #include <QWidget>
-#include <qtmetamacros.h>
 
+class QCheckBox;
 class QComboBox;
 class LineEditUnfocusable;
 class CardFilter;
diff --git a/cockatrice/src/filters/filter_tree_model.cpp b/cockatrice/src/filters/filter_tree_model.cpp
index b3bf307f1..33b54530e 100644
--- a/cockatrice/src/filters/filter_tree_model.cpp
+++ b/cockatrice/src/filters/filter_tree_model.cpp
@@ -1,15 +1,8 @@
 #include "filter_tree_model.h"
 
-#include <QFlags>
 #include <QFont>
-#include <QString>
-#include <QVariant>
-#include <functional>
 #include <libcockatrice/filters/filter_card.h>
 #include <libcockatrice/filters/filter_tree.h>
-#include <stddef.h>
-
-class QObject;
 
 FilterTreeModel::FilterTreeModel(QObject *parent) : QAbstractItemModel(parent)
 {
diff --git a/cockatrice/src/filters/filter_tree_model.h b/cockatrice/src/filters/filter_tree_model.h
index 826fcc941..7452f7a61 100644
--- a/cockatrice/src/filters/filter_tree_model.h
+++ b/cockatrice/src/filters/filter_tree_model.h
@@ -8,15 +8,11 @@
 #define FILTERTREEMODEL_H
 
 #include <QAbstractItemModel>
-#include <QList>
-#include <QModelIndex>
 #include <libcockatrice/filters/filter_card.h>
-#include <qnamespace.h>
-#include <qtmetamacros.h>
 
 class FilterTree;
+class CardFilter;
 class FilterTreeNode;
-class QObject;
 
 class FilterTreeModel : public QAbstractItemModel
 {
diff --git a/cockatrice/src/filters/syntax_help.cpp b/cockatrice/src/filters/syntax_help.cpp
index baf5764d0..fa5338a41 100644
--- a/cockatrice/src/filters/syntax_help.cpp
+++ b/cockatrice/src/filters/syntax_help.cpp
@@ -1,21 +1,8 @@
 #include "syntax_help.h"
 
-#include <QDebug>
 #include <QFile>
-#include <QFlags>
-#include <QIODevice>
-#include <QLineEdit>
-#include <QMessageLogger>
-#include <QObject>
 #include <QRegularExpression>
-#include <QSharedPointer>
-#include <QSize>
-#include <QString>
-#include <QTextBrowser>
-#include <QTextDocument>
 #include <QTextStream>
-#include <QUrl>
-#include <qnamespace.h>
 
 /**
  * Creates the card search syntax help window
diff --git a/cockatrice/src/filters/syntax_help.h b/cockatrice/src/filters/syntax_help.h
index 52c878691..d06fe03e5 100644
--- a/cockatrice/src/filters/syntax_help.h
+++ b/cockatrice/src/filters/syntax_help.h
@@ -8,10 +8,9 @@
 #ifndef SEARCH_SYNTAX_HELP_H
 #define SEARCH_SYNTAX_HELP_H
 
+#include <QLineEdit>
 #include <QLoggingCategory>
-
-class QLineEdit;
-class QTextBrowser;
+#include <QTextBrowser>
 
 inline Q_LOGGING_CATEGORY(SyntaxHelpLog, "syntax_help");
 
diff --git a/cockatrice/src/game/abstract_game.cpp b/cockatrice/src/game/abstract_game.cpp
index efc575eff..6aa2ab28f 100644
--- a/cockatrice/src/game/abstract_game.cpp
+++ b/cockatrice/src/game/abstract_game.cpp
@@ -1,18 +1,7 @@
 #include "abstract_game.h"
 
-#include "game_event_handler.h"
-#include "game_meta_info.h"
-#include "game_state.h"
-#include "libcockatrice/protocol/pb/game_replay.pb.h"
-#include "player/player_info.h"
+#include "../interface/widgets/tabs/tab_game.h"
 #include "player/player_logic.h"
-#include "player/player_manager.h"
-#include "zones/card_zone_logic.h"
-
-#include <QList>
-#include <QMap>
-
-class AbstractClient;
 
 AbstractGame::AbstractGame(QObject *_parent) : QObject(_parent)
 {
diff --git a/cockatrice/src/game/abstract_game.h b/cockatrice/src/game/abstract_game.h
index 326af8ac9..fcf764492 100644
--- a/cockatrice/src/game/abstract_game.h
+++ b/cockatrice/src/game/abstract_game.h
@@ -7,18 +7,15 @@
 #ifndef COCKATRICE_ABSTRACT_GAME_H
 #define COCKATRICE_ABSTRACT_GAME_H
 
+#include "game_event_handler.h"
+#include "game_meta_info.h"
+#include "game_state.h"
+#include "player/player_manager.h"
+
 #include <QObject>
-#include <QString>
-#include <qtmetamacros.h>
+#include <libcockatrice/protocol/pb/game_replay.pb.h>
 
 class CardItem;
-class AbstractClient;
-class GameEventHandler;
-class GameMetaInfo;
-class GameReplay;
-class GameState;
-class PlayerManager;
-
 class AbstractGame : public QObject
 {
     Q_OBJECT
diff --git a/cockatrice/src/game/arrow_registry.cpp b/cockatrice/src/game/arrow_registry.cpp
index c05134a75..286764b3b 100644
--- a/cockatrice/src/game/arrow_registry.cpp
+++ b/cockatrice/src/game/arrow_registry.cpp
@@ -1,9 +1,6 @@
 #include "arrow_registry.h"
 
 #include "../game_graphics/board/arrow_item.h"
-#include "board/arrow_data.h"
-
-#include <QSharedPointer>
 
 void ArrowRegistry::insert(QSharedPointer<ArrowData> data, ArrowItem *arrow)
 {
diff --git a/cockatrice/src/game/arrow_registry.h b/cockatrice/src/game/arrow_registry.h
index ca3b04090..ef98229a2 100644
--- a/cockatrice/src/game/arrow_registry.h
+++ b/cockatrice/src/game/arrow_registry.h
@@ -1,13 +1,13 @@
 #ifndef COCKATRICE_ARROW_REGISTRY_H
 #define COCKATRICE_ARROW_REGISTRY_H
 
-#include <QList>
+#include "board/arrow_data.h"
+
 #include <QMap>
 #include <QSet>
+#include <QSharedPointer>
 
 class ArrowItem;
-struct ArrowData;
-template <class T> class QSharedPointer;
 
 struct ArrowKey
 {
diff --git a/cockatrice/src/game/board/arrow_data.cpp b/cockatrice/src/game/board/arrow_data.cpp
index d5accd16e..9e89deed0 100644
--- a/cockatrice/src/game/board/arrow_data.cpp
+++ b/cockatrice/src/game/board/arrow_data.cpp
@@ -1,8 +1,5 @@
 #include "arrow_data.h"
 
-#include "libcockatrice/protocol/pb/serverinfo_arrow.pb.h"
-#include "libcockatrice/utility/color.h"
-
 ArrowData ArrowData::fromProto(const ServerInfo_Arrow &arrow, int creatorId, bool isLocalCreator)
 {
     ArrowData data;
diff --git a/cockatrice/src/game/board/arrow_data.h b/cockatrice/src/game/board/arrow_data.h
index 00217512f..2752f97e3 100644
--- a/cockatrice/src/game/board/arrow_data.h
+++ b/cockatrice/src/game/board/arrow_data.h
@@ -3,8 +3,8 @@
 
 #include <QColor>
 #include <QString>
-
-class ServerInfo_Arrow;
+#include <libcockatrice/protocol/pb/serverinfo_arrow.pb.h>
+#include <libcockatrice/utility/color.h>
 
 struct ArrowData
 {
diff --git a/cockatrice/src/game/board/card_list.cpp b/cockatrice/src/game/board/card_list.cpp
index 94bae67cd..0080b5ae6 100644
--- a/cockatrice/src/game/board/card_list.cpp
+++ b/cockatrice/src/game/board/card_list.cpp
@@ -1,14 +1,9 @@
 #include "card_list.h"
 
 #include "../../game_graphics/board/card_item.h"
-#include "libcockatrice/card/printing/exact_card.h"
 
-#include <QChar>
 #include <QDebug>
-#include <QMessageLogger>
-#include <QSharedPointer>
 #include <algorithm>
-#include <compare>
 #include <libcockatrice/card/card_info.h>
 
 CardList::CardList(bool _contentsKnown) : QList<CardItem *>(), contentsKnown(_contentsKnown)
diff --git a/cockatrice/src/game/board/card_list.h b/cockatrice/src/game/board/card_list.h
index b5427df0d..85a6848b7 100644
--- a/cockatrice/src/game/board/card_list.h
+++ b/cockatrice/src/game/board/card_list.h
@@ -9,8 +9,6 @@
 
 #include <QList>
 #include <QLoggingCategory>
-#include <QString>
-#include <functional>
 
 inline Q_LOGGING_CATEGORY(CardListLog, "card_list");
 
diff --git a/cockatrice/src/game/board/card_state.cpp b/cockatrice/src/game/board/card_state.cpp
index 3f879a849..4319400d7 100644
--- a/cockatrice/src/game/board/card_state.cpp
+++ b/cockatrice/src/game/board/card_state.cpp
@@ -1,7 +1,5 @@
 #include "card_state.h"
 
-#include <QSharedPointer>
-
 void CardState::resetState(bool keepAnnotations)
 {
     attacking = false;
diff --git a/cockatrice/src/game/board/card_state.h b/cockatrice/src/game/board/card_state.h
index ca7aaf927..0498b1aa2 100644
--- a/cockatrice/src/game/board/card_state.h
+++ b/cockatrice/src/game/board/card_state.h
@@ -3,12 +3,9 @@
 
 #include <QMap>
 #include <QObject>
-#include <QString>
-#include <qtmetamacros.h>
 
 class CardZoneLogic;
 class CardItem;
-
 class CardState : public QObject
 {
     Q_OBJECT
diff --git a/cockatrice/src/game/board/counter_state.cpp b/cockatrice/src/game/board/counter_state.cpp
index 5d8c73d5b..0970e4272 100644
--- a/cockatrice/src/game/board/counter_state.cpp
+++ b/cockatrice/src/game/board/counter_state.cpp
@@ -1,7 +1,5 @@
 #include "counter_state.h"
 
-#include "libcockatrice/protocol/pb/serverinfo_counter.pb.h"
-
 #include <libcockatrice/utility/color.h>
 
 CounterState::CounterState(int id, const QString &name, const QColor &color, int radius, int value, QObject *parent)
diff --git a/cockatrice/src/game/board/counter_state.h b/cockatrice/src/game/board/counter_state.h
index 8badc6217..4c7b34473 100644
--- a/cockatrice/src/game/board/counter_state.h
+++ b/cockatrice/src/game/board/counter_state.h
@@ -4,9 +4,7 @@
 #include <QColor>
 #include <QObject>
 #include <QString>
-#include <qtmetamacros.h>
-
-class ServerInfo_Counter;
+#include <libcockatrice/protocol/pb/serverinfo_counter.pb.h>
 
 class CounterState : public QObject
 {
diff --git a/cockatrice/src/game/game.cpp b/cockatrice/src/game/game.cpp
index 7343d052a..4c8b109c2 100644
--- a/cockatrice/src/game/game.cpp
+++ b/cockatrice/src/game/game.cpp
@@ -1,17 +1,9 @@
 #include "game.h"
 
-#include "game_meta_info.h"
-#include "game_state.h"
-#include "player/player_manager.h"
+#include "../interface/widgets/tabs/tab_game.h"
 
-#include <QList>
-#include <QMap>
-#include <QString>
 #include <libcockatrice/protocol/pb/event_game_joined.pb.h>
 
-class AbstractClient;
-class QObject;
-
 Game::Game(QObject *_parent,
            bool isLocalGame,
            QList<AbstractClient *> &_clients,
diff --git a/cockatrice/src/game/game.h b/cockatrice/src/game/game.h
index 6a309cfb2..4f912664c 100644
--- a/cockatrice/src/game/game.h
+++ b/cockatrice/src/game/game.h
@@ -9,14 +9,7 @@
 
 #include "abstract_game.h"
 
-#include <qtmetamacros.h>
-
-class AbstractClient;
-class Event_GameJoined;
-class QObject;
-class QString;
-template <class Key, class T> class QMap;
-template <typename T> class QList;
+#include <QObject>
 
 class Game : public AbstractGame
 {
diff --git a/cockatrice/src/game/game_event_handler.cpp b/cockatrice/src/game/game_event_handler.cpp
index 7b08af47c..f146cdbb4 100644
--- a/cockatrice/src/game/game_event_handler.cpp
+++ b/cockatrice/src/game/game_event_handler.cpp
@@ -1,30 +1,9 @@
 #include "game_event_handler.h"
 
+#include "../game_graphics/log/message_log_widget.h"
+#include "../interface/widgets/tabs/tab_game.h"
 #include "abstract_game.h"
-#include "game_meta_info.h"
-#include "game_state.h"
-#include "libcockatrice/protocol/pb/commands.pb.h"
-#include "libcockatrice/protocol/pb/game_commands.pb.h"
-#include "libcockatrice/protocol/pb/game_event.pb.h"
-#include "libcockatrice/protocol/pb/game_event_context.pb.h"
-#include "libcockatrice/protocol/pb/response.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_game.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_player.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_playerproperties.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_user.pb.h"
-#include "player/player_event_handler.h"
-#include "player/player_info.h"
-#include "player/player_logic.h"
-#include "player/player_manager.h"
 
-#include <QList>
-#include <QMap>
-#include <QMapIterator>
-#include <QMessageLogger>
-#include <QSharedPointer>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/stubs/port.h>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/get_pb_extension.h>
 #include <libcockatrice/protocol/pb/command_concede.pb.h>
@@ -34,6 +13,7 @@
 #include <libcockatrice/protocol/pb/command_next_turn.pb.h>
 #include <libcockatrice/protocol/pb/command_reverse_turn.pb.h>
 #include <libcockatrice/protocol/pb/command_set_active_phase.pb.h>
+#include <libcockatrice/protocol/pb/context_connection_state_changed.pb.h>
 #include <libcockatrice/protocol/pb/context_deck_select.pb.h>
 #include <libcockatrice/protocol/pb/event_game_closed.pb.h>
 #include <libcockatrice/protocol/pb/event_game_host_changed.pb.h>
@@ -48,8 +28,6 @@
 #include <libcockatrice/protocol/pb/event_set_active_player.pb.h>
 #include <libcockatrice/protocol/pb/game_event_container.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
-#include <string>
-#include <utility>
 
 GameEventHandler::GameEventHandler(AbstractGame *_game) : QObject(_game), game(_game)
 {
@@ -277,6 +255,8 @@ void GameEventHandler::eventSpectatorLeave(const Event_Leave &event,
     emit spectatorLeft(eventPlayerId);
 
     game->getPlayerManager()->removeSpectator(eventPlayerId);
+
+    emitUserEvent();
 }
 
 void GameEventHandler::eventGameStateChanged(const Event_GameStateChanged &event,
@@ -463,9 +443,9 @@ void GameEventHandler::eventJoin(const Event_Join &event, int /*eventPlayerId*/,
         PlayerLogic *newPlayer = game->getPlayerManager()->addPlayer(playerId, playerInfo.user_info());
         emit logJoinPlayer(newPlayer);
         emit playerJoined(playerInfo);
-
-        emitUserEvent();
     }
+
+    emitUserEvent();
 }
 
 QString GameEventHandler::getLeaveReason(Event_Leave::LeaveReason reason)
diff --git a/cockatrice/src/game/game_event_handler.h b/cockatrice/src/game/game_event_handler.h
index 30021d295..99277abb7 100644
--- a/cockatrice/src/game/game_event_handler.h
+++ b/cockatrice/src/game/game_event_handler.h
@@ -19,29 +19,23 @@
 
 #include <QLoggingCategory>
 #include <QObject>
-#include <QPair>
-#include <QString>
-#include <QVector>
 #include <libcockatrice/protocol/pb/event_leave.pb.h>
-#include <qtmetamacros.h>
-
-// IWYU pragma: keep
-// GameEventContext, ServerInfo_Player and ServerInfo_User are passed by value
-// to signals and slots, so the moc-generated code needs the complete types.
-#include <libcockatrice/protocol/pb/game_event_context.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_player.pb.h>
-#include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
 
 class AbstractClient;
 class AbstractGame;
+class CommandContainer;
+class GameCommand;
 class GameEventContainer;
 class GameEventContext;
 class PendingCommand;
 class PlayerLogic;
 class Response;
+
 class Event_GameStateChanged;
 class Event_PlayerPropertiesChanged;
 class Event_Join;
+class Event_Leave;
 class Event_GameHostChanged;
 class Event_GameClosed;
 class Event_SetActivePlayer;
@@ -50,15 +44,6 @@ class Event_GameSay;
 class Event_Kicked;
 class Event_ReverseTurn;
 class Event_Ping;
-class ServerInfo_PlayerProperties;
-namespace google
-{
-namespace protobuf
-{
-class Message;
-} // namespace protobuf
-} // namespace google
-template <typename T> class QList;
 
 inline Q_LOGGING_CATEGORY(GameEventHandlerLog, "game_event_handler");
 
diff --git a/cockatrice/src/game/game_meta_info.h b/cockatrice/src/game/game_meta_info.h
index ef8f0c08e..cdba1605f 100644
--- a/cockatrice/src/game/game_meta_info.h
+++ b/cockatrice/src/game/game_meta_info.h
@@ -9,16 +9,13 @@
 
 #include <QMap>
 #include <QObject>
-#include <QString>
 #include <libcockatrice/protocol/pb/serverinfo_game.pb.h>
-#include <qtmetamacros.h>
 
 // Translation layer class to expose protobuf safely and hook it up to Qt Signals.
 // This class de-couples the domain object (i.e. the GameMetaInfo) from the network object.
 // If the network object changes, only this class needs to be adjusted.
 
 class AbstractGame;
-
 class GameMetaInfo : public QObject
 {
     Q_OBJECT
diff --git a/cockatrice/src/game/game_state.cpp b/cockatrice/src/game/game_state.cpp
index e3bbbec00..dc9ba02a3 100644
--- a/cockatrice/src/game/game_state.cpp
+++ b/cockatrice/src/game/game_state.cpp
@@ -2,11 +2,6 @@
 
 #include "abstract_game.h"
 
-#include <QChar>
-#include <QTimer>
-
-class AbstractClient;
-
 GameState::GameState(AbstractGame *parent,
                      int _secondsElapsed,
                      int _hostId,
diff --git a/cockatrice/src/game/game_state.h b/cockatrice/src/game/game_state.h
index 55784fb91..94bbb853c 100644
--- a/cockatrice/src/game/game_state.h
+++ b/cockatrice/src/game/game_state.h
@@ -7,14 +7,12 @@
 #ifndef COCKATRICE_GAME_STATE_H
 #define COCKATRICE_GAME_STATE_H
 
-#include <QList>
-#include <QObject>
-#include <QString>
-#include <qtmetamacros.h>
+#include <QTimer>
+#include <libcockatrice/network/client/abstract/abstract_client.h>
 
 class AbstractGame;
-class AbstractClient;
-class QTimer;
+class ServerInfo_PlayerProperties;
+class ServerInfo_User;
 
 class GameState : public QObject
 {
diff --git a/cockatrice/src/game/phase.cpp b/cockatrice/src/game/phase.cpp
index f56228279..7fb1700a5 100644
--- a/cockatrice/src/game/phase.cpp
+++ b/cockatrice/src/game/phase.cpp
@@ -1,10 +1,5 @@
 #include "phase.h"
 
-#include <QByteArray>
-#include <QList>
-#include <QSharedPointer>
-#include <QtGlobal>
-
 Phase::Phase(const QString &_name, const QString &_color, const QString &_soundFileName)
     : name(_name), color(_color), soundFileName(_soundFileName)
 {
diff --git a/cockatrice/src/game/phase.h b/cockatrice/src/game/phase.h
index b4eaa6e46..a888ad43b 100644
--- a/cockatrice/src/game/phase.h
+++ b/cockatrice/src/game/phase.h
@@ -7,9 +7,8 @@
 #ifndef PHASE_H
 #define PHASE_H
 
-#include <QCoreApplication>
+#include <QApplication>
 #include <QString>
-#include <QVector>
 
 class Phase
 {
diff --git a/cockatrice/src/game/player/player_actions.cpp b/cockatrice/src/game/player/player_actions.cpp
index 35682ede8..67c3295d6 100644
--- a/cockatrice/src/game/player/player_actions.cpp
+++ b/cockatrice/src/game/player/player_actions.cpp
@@ -1,54 +1,14 @@
 #include "player_actions.h"
 
-#include "../../client/settings/cache_settings.h"
-#include "../../game_graphics/board/card_item.h"
-#include "../../game_graphics/dialogs/dlg_create_token.h"
 #include "../../game_graphics/dialogs/dlg_move_top_cards_until.h"
+#include "../../game_graphics/dialogs/dlg_roll_dice.h"
 #include "../../game_graphics/player/card_menu_action_type.h"
+#include "../../game_graphics/zones/hand_zone.h"
 #include "../../game_graphics/zones/table_zone.h"
-#include "../../interface/deck_loader/loaded_deck.h"
-#include "../abstract_game.h"
-#include "../board/counter_state.h"
-#include "../game_event_handler.h"
-#include "../zones/card_zone_logic.h"
-#include "../zones/hand_zone_logic.h"
-#include "../zones/pile_zone_logic.h"
-#include "../zones/table_zone_logic.h"
+#include "../../interface/widgets/tabs/tab_game.h"
+#include "../../interface/widgets/utility/get_text_with_max.h"
 #include "../zones/view_zone_logic.h"
-#include "libcockatrice/card/database/card_database_querier.h"
-#include "libcockatrice/card/printing/exact_card.h"
-#include "libcockatrice/card/printing/printing_info.h"
-#include "libcockatrice/card/relation/card_relation_type.h"
-#include "libcockatrice/deck_list/deck_list.h"
-#include "libcockatrice/filters/filter_string.h"
-#include "libcockatrice/protocol/pb/card_attributes.pb.h"
-#include "libcockatrice/protocol/pb/game_commands.pb.h"
-#include "libcockatrice/settings/cards_display_settings.h"
-#include "player_info.h"
-#include "player_logic.h"
 
-#include <QAction>
-#include <QChar>
-#include <QColor>
-#include <QFlags>
-#include <QInputDialog>
-#include <QKeyEvent>
-#include <QList>
-#include <QMap>
-#include <QMapIterator>
-#include <QMetaType>
-#include <QPoint>
-#include <QPointF>
-#include <QSharedPointer>
-#include <QTimer>
-#include <QVariant>
-#include <QVariantList>
-#include <QtGlobal>
-#include <algorithm>
-#include <functional>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/stubs/port.h>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/card/relation/card_relation.h>
 #include <libcockatrice/protocol/pb/command_attach_card.pb.h>
@@ -66,16 +26,13 @@
 #include <libcockatrice/protocol/pb/command_set_card_counter.pb.h>
 #include <libcockatrice/protocol/pb/command_shuffle.pb.h>
 #include <libcockatrice/protocol/pb/command_undo_draw.pb.h>
+#include <libcockatrice/protocol/pb/context_move_card.pb.h>
 #include <libcockatrice/settings/card_override_settings.h>
 #include <libcockatrice/settings/interface_settings.h>
 #include <libcockatrice/utility/clamped_arithmetic.h>
 #include <libcockatrice/utility/counter_limits.h>
 #include <libcockatrice/utility/expression.h>
 #include <libcockatrice/utility/zone_names.h>
-#include <memory>
-#include <qnamespace.h>
-#include <qnumeric.h>
-#include <string>
 
 // milliseconds in between triggers of the move top cards until action
 static constexpr int MOVE_TOP_CARD_UNTIL_INTERVAL = 100;
diff --git a/cockatrice/src/game/player/player_actions.h b/cockatrice/src/game/player/player_actions.h
index 8fff81635..fa4d54110 100644
--- a/cockatrice/src/game/player/player_actions.h
+++ b/cockatrice/src/game/player/player_actions.h
@@ -8,25 +8,17 @@
 #ifndef COCKATRICE_PLAYER_ACTIONS_H
 #define COCKATRICE_PLAYER_ACTIONS_H
 
-#include "../../game_graphics/board/card_item.h" // IWYU pragma: keep - moc instantiates the metatype for QList<CardItem *>, which Qt 6.4 needs complete
+#include "../../game_graphics/board/card_item.h"
 #include "../../game_graphics/dialogs/dlg_create_token.h"
 #include "../../game_graphics/dialogs/dlg_move_top_cards_until.h"
 #include "../../game_graphics/player/card_menu_action_type.h"
-#include "../board/card_list.h"
-#include "libcockatrice/card/card_info.h"
+#include "event_processing_options.h"
+#include "player_logic.h"
 
+#include <QMenu>
 #include <QObject>
-#include <QString>
-#include <QStringList>
 #include <libcockatrice/card/relation/card_relation_type.h>
 #include <libcockatrice/filters/filter_string.h>
-#include <qtmetamacros.h>
-
-class CardItem;
-class CardRelation;
-class QAction;
-class QTimer;
-template <typename T> class QList;
 
 namespace google
 {
@@ -37,9 +29,9 @@ class Message;
 } // namespace google
 
 class Command_MoveCard;
+class GameEventContext;
 class PendingCommand;
 class PlayerLogic;
-
 class PlayerActions : public QObject
 {
     Q_OBJECT
diff --git a/cockatrice/src/game/player/player_event_handler.cpp b/cockatrice/src/game/player/player_event_handler.cpp
index 18f6573df..277b8b1d4 100644
--- a/cockatrice/src/game/player/player_event_handler.cpp
+++ b/cockatrice/src/game/player/player_event_handler.cpp
@@ -1,32 +1,15 @@
 #include "player_event_handler.h"
 
+#include "../../game_graphics/board/arrow_item.h"
 #include "../../game_graphics/board/card_item.h"
 #include "../../game_graphics/zones/view_zone.h"
-#include "../abstract_game.h"
+#include "../../interface/widgets/tabs/tab_game.h"
 #include "../board/arrow_data.h"
 #include "../board/card_list.h"
-#include "../board/counter_state.h"
-#include "../zones/card_zone_logic.h"
-#include "../zones/hand_zone_logic.h"
-#include "../zones/pile_zone_logic.h"
-#include "libcockatrice/card/card_info.h"
-#include "libcockatrice/card/printing/exact_card.h"
-#include "libcockatrice/protocol/pb/card_attributes.pb.h"
-#include "libcockatrice/protocol/pb/game_event.pb.h"
-#include "libcockatrice/protocol/pb/game_event_context.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_card.pb.h"
-#include "libcockatrice/utility/card_ref.h"
 #include "player_actions.h"
-#include "player_info.h"
 #include "player_logic.h"
-#include "player_manager.h"
 
-#include <QDebug>
-#include <QList>
-#include <QMap>
-#include <QSharedPointer>
-#include <QtGlobal>
-#include <algorithm>
+#include <libcockatrice/protocol/pb/command_set_card_attr.pb.h>
 #include <libcockatrice/protocol/pb/context_move_card.pb.h>
 #include <libcockatrice/protocol/pb/context_undo_draw.pb.h>
 #include <libcockatrice/protocol/pb/event_attach_card.pb.h>
@@ -49,9 +32,8 @@
 #include <libcockatrice/protocol/pb/event_set_card_counter.pb.h>
 #include <libcockatrice/protocol/pb/event_set_counter.pb.h>
 #include <libcockatrice/protocol/pb/event_shuffle.pb.h>
+#include <libcockatrice/utility/color.h>
 #include <libcockatrice/utility/zone_names.h>
-#include <qlogging.h>
-#include <string>
 
 PlayerEventHandler::PlayerEventHandler(PlayerLogic *_player) : QObject(_player), player(_player)
 {
diff --git a/cockatrice/src/game/player/player_event_handler.h b/cockatrice/src/game/player/player_event_handler.h
index 88254119b..300cacd08 100644
--- a/cockatrice/src/game/player/player_event_handler.h
+++ b/cockatrice/src/game/player/player_event_handler.h
@@ -22,14 +22,14 @@
 #include "event_processing_options.h"
 
 #include <QObject>
-#include <QString>
+#include <libcockatrice/protocol/pb/card_attributes.pb.h>
 #include <libcockatrice/protocol/pb/game_event.pb.h>
-#include <qtmetamacros.h>
-#include <sys/types.h>
+#include <libcockatrice/protocol/pb/game_event_context.pb.h>
 
 class CardItem;
 class CardZoneLogic;
 class PlayerLogic;
+
 class Event_AttachCard;
 class Event_ChangeZoneProperties;
 class Event_CreateArrow;
@@ -50,9 +50,6 @@ class Event_SetCardCounter;
 class Event_SetCounter;
 class Event_Shuffle;
 class Event_GameLogNotice;
-class GameEventContext;
-enum CardAttribute : int;
-template <typename T> class QList;
 
 /**
  * @class PlayerEventHandler
diff --git a/cockatrice/src/game/player/player_info.cpp b/cockatrice/src/game/player/player_info.cpp
index aef0d82aa..c4debde0f 100644
--- a/cockatrice/src/game/player/player_info.cpp
+++ b/cockatrice/src/game/player/player_info.cpp
@@ -1,7 +1,5 @@
 #include "player_info.h"
 
-#include "libcockatrice/protocol/pb/serverinfo_user.pb.h"
-
 PlayerInfo::PlayerInfo(const ServerInfo_User &info, int _id, bool _local, bool _judge)
     : id(_id), local(_local), judge(_judge)
 {
diff --git a/cockatrice/src/game/player/player_info.h b/cockatrice/src/game/player/player_info.h
index 58e877f8e..4ec39edbd 100644
--- a/cockatrice/src/game/player/player_info.h
+++ b/cockatrice/src/game/player/player_info.h
@@ -7,10 +7,10 @@
 #ifndef COCKATRICE_PLAYER_INFO_H
 #define COCKATRICE_PLAYER_INFO_H
 
+#include "../../game_graphics/player/player_target.h"
+
 #include <QObject>
-#include <QString>
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
-#include <qtmetamacros.h>
 
 class PlayerInfo : public QObject
 {
diff --git a/cockatrice/src/game/player/player_logic.cpp b/cockatrice/src/game/player/player_logic.cpp
index b545b7088..143df5c57 100644
--- a/cockatrice/src/game/player/player_logic.cpp
+++ b/cockatrice/src/game/player/player_logic.cpp
@@ -1,37 +1,33 @@
 #include "player_logic.h"
 
+#include "../../game_graphics/board/arrow_item.h"
 #include "../../game_graphics/board/card_item.h"
-#include "../abstract_game.h"
-#include "../board/arrow_data.h"
-#include "../board/counter_state.h"
-#include "../game_meta_info.h"
-#include "../zones/hand_zone_logic.h"
-#include "../zones/pile_zone_logic.h"
-#include "../zones/stack_zone_logic.h"
-#include "../zones/table_zone_logic.h"
-#include "libcockatrice/protocol/pb/serverinfo_card.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_counter.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_playerproperties.pb.h"
-#include "libcockatrice/utility/zone_names.h"
+#include "../../game_graphics/board/counter_general.h"
+#include "../../game_graphics/game_scene.h"
+#include "../../game_graphics/player/player_target.h"
+#include "../../game_graphics/zones/hand_zone.h"
+#include "../../game_graphics/zones/pile_zone.h"
+#include "../../game_graphics/zones/stack_zone.h"
+#include "../../game_graphics/zones/table_zone.h"
+#include "../../interface/theme_manager.h"
+#include "../../interface/widgets/tabs/tab_game.h"
+#include "../board/card_list.h"
 #include "player_actions.h"
-#include "player_event_handler.h"
-#include "player_info.h"
-#include "player_manager.h"
 
 #include <QDebug>
-#include <QMapIterator>
-#include <QMessageLogger>
-#include <QMutableMapIterator>
-#include <QSet>
-#include <QSharedPointer>
-#include <QtGlobal>
+#include <QMenu>
+#include <QMetaType>
+#include <QPainter>
+#include <QtConcurrent>
+#include <libcockatrice/protocol/pb/command_attach_card.pb.h>
+#include <libcockatrice/protocol/pb/command_set_card_counter.pb.h>
+#include <libcockatrice/protocol/pb/event_create_arrow.pb.h>
+#include <libcockatrice/protocol/pb/event_create_counter.pb.h>
+#include <libcockatrice/protocol/pb/event_draw_cards.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_player.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_zone.pb.h>
-#include <libcockatrice/utility/card_ref.h>
 #include <libcockatrice/utility/color.h>
-#include <qalgorithms.h>
-#include <string>
 
 PlayerLogic::PlayerLogic(const ServerInfo_User &info, int _id, bool _local, bool _judge, AbstractGame *_parent)
     : QObject(_parent), game(_parent), playerInfo(new PlayerInfo(info, _id, _local, _judge)),
diff --git a/cockatrice/src/game/player/player_logic.h b/cockatrice/src/game/player/player_logic.h
index 59da7cc32..6923b3afe 100644
--- a/cockatrice/src/game/player/player_logic.h
+++ b/cockatrice/src/game/player/player_logic.h
@@ -7,48 +7,57 @@
 #ifndef PLAYER_H
 #define PLAYER_H
 
-#include "../zones/card_zone_logic.h"
+#include "../../game_graphics/player/player_area.h"
+#include "../../interface/widgets/menus/tearoff_menu.h"
+#include "../board/arrow_data.h"
+#include "../interface/deck_loader/loaded_deck.h"
 #include "../zones/hand_zone_logic.h"
 #include "../zones/pile_zone_logic.h"
 #include "../zones/stack_zone_logic.h"
 #include "../zones/table_zone_logic.h"
-#include "libcockatrice/deck_list/deck_list.h"
-#include "libcockatrice/utility/card_ref.h"
-#include "libcockatrice/utility/playmat_params.h"
+#include "player_event_handler.h"
+#include "player_info.h"
+#include "player_manager.h"
 
-#include <QColor>
 #include <QInputDialog>
-#include <QList>
 #include <QLoggingCategory>
 #include <QMap>
-#include <QObject>
-#include <QString>
+#include <QTimer>
+#include <libcockatrice/filters/filter_string.h>
+#include <libcockatrice/protocol/pb/card_attributes.pb.h>
+#include <libcockatrice/protocol/pb/game_event.pb.h>
 #include <libcockatrice/utility/zone_names.h>
-#include <qtmetamacros.h>
-
-// IWYU pragma: keep
-// ServerInfo_Card appears inside QList<...> in signal and slot
-// signatures, which the moc-generated code needs to be complete.
-#include <libcockatrice/protocol/pb/serverinfo_card.pb.h>
-
-class CardItem;
-class CounterState;
-class QWidget;
-class ServerInfo_PlayerProperties;
-struct ArrowData;
-struct LoadedDeck;
-template <class T> class QSharedPointer;
 
 inline Q_LOGGING_CATEGORY(PlayerLog, "player");
+
+namespace google
+{
+namespace protobuf
+{
+class Message;
+}
+} // namespace google
 class AbstractCardItem;
 class AbstractGame;
+class ArrowItem;
+class ArrowTarget;
+class CardDatabase;
+class CardZone;
+class CommandContainer;
+class GameCommand;
+class GameEvent;
 class PlayerInfo;
 class PlayerEventHandler;
 class PlayerActions;
+class PlayerMenu;
+class QAction;
+class QMenu;
+class ServerInfo_Arrow;
 class ServerInfo_Card;
 class ServerInfo_Counter;
 class ServerInfo_Player;
 class ServerInfo_User;
+class TabGame;
 
 const int MAX_TOKENS_PER_DIALOG = 99;
 
diff --git a/cockatrice/src/game/player/player_manager.cpp b/cockatrice/src/game/player/player_manager.cpp
index 4730805ad..8486efbeb 100644
--- a/cockatrice/src/game/player/player_manager.cpp
+++ b/cockatrice/src/game/player/player_manager.cpp
@@ -1,14 +1,8 @@
 #include "player_manager.h"
 
 #include "../abstract_game.h"
-#include "../game_state.h"
-#include "player_info.h"
 #include "player_logic.h"
 
-#include <QList>
-#include <QMapIterator>
-#include <QSharedPointer>
-
 PlayerManager::PlayerManager(AbstractGame *_game,
                              int _localPlayerId,
                              bool _localPlayerIsJudge,
diff --git a/cockatrice/src/game/player/player_manager.h b/cockatrice/src/game/player/player_manager.h
index 7a9f7645b..504e65396 100644
--- a/cockatrice/src/game/player/player_manager.h
+++ b/cockatrice/src/game/player/player_manager.h
@@ -7,17 +7,12 @@
 #ifndef COCKATRICE_PLAYER_MANAGER_H
 #define COCKATRICE_PLAYER_MANAGER_H
 
-#include "libcockatrice/protocol/pb/serverinfo_user.pb.h"
-
 #include <QMap>
 #include <QObject>
-#include <QString>
 #include <libcockatrice/protocol/pb/serverinfo_playerproperties.pb.h>
-#include <qtmetamacros.h>
 
 class AbstractGame;
 class PlayerLogic;
-
 class PlayerManager : public QObject
 {
     Q_OBJECT
diff --git a/cockatrice/src/game/replay.cpp b/cockatrice/src/game/replay.cpp
index 4ab4a6321..dcf3e9b9b 100644
--- a/cockatrice/src/game/replay.cpp
+++ b/cockatrice/src/game/replay.cpp
@@ -1,13 +1,6 @@
 #include "replay.h"
 
-#include "game_meta_info.h"
-#include "game_state.h"
-#include "player/player_manager.h"
-
-#include <QList>
-
-class GameReplay;
-class QObject;
+#include "../interface/widgets/tabs/tab_game.h"
 
 Replay::Replay(QObject *_parent, const GameReplay *_replay, bool isLocalGame) : AbstractGame(_parent)
 {
diff --git a/cockatrice/src/game/replay.h b/cockatrice/src/game/replay.h
index cc995dbac..1c269b273 100644
--- a/cockatrice/src/game/replay.h
+++ b/cockatrice/src/game/replay.h
@@ -10,11 +10,6 @@
 
 #include "abstract_game.h"
 
-#include <qtmetamacros.h>
-
-class GameReplay;
-class QObject;
-
 class Replay : public AbstractGame
 {
     Q_OBJECT
diff --git a/cockatrice/src/game/zones/card_zone_logic.cpp b/cockatrice/src/game/zones/card_zone_logic.cpp
index d997ab9ad..7e0585f4e 100644
--- a/cockatrice/src/game/zones/card_zone_logic.cpp
+++ b/cockatrice/src/game/zones/card_zone_logic.cpp
@@ -1,25 +1,16 @@
 #include "card_zone_logic.h"
 
-#include "../../client/translation.h"
 #include "../../game_graphics/board/card_item.h"
-#include "../../game_graphics/zones/card_zone.h"
 #include "../../game_graphics/zones/view_zone.h"
-#include "../board/card_list.h"
 #include "../player/player_actions.h"
-#include "../player/player_info.h"
 #include "../player/player_logic.h"
-#include "libcockatrice/card/database/card_database.h"
 #include "view_zone_logic.h"
 
 #include <QAction>
 #include <QDebug>
-#include <QMessageLogger>
-#include <QSharedPointer>
-#include <QVariant>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/protocol/pb/command_move_card.pb.h>
 #include <libcockatrice/utility/zone_names.h>
-#include <string>
 
 /**
  * @param _player the player that the zone belongs to
diff --git a/cockatrice/src/game/zones/card_zone_logic.h b/cockatrice/src/game/zones/card_zone_logic.h
index 2e232b258..ae97719a9 100644
--- a/cockatrice/src/game/zones/card_zone_logic.h
+++ b/cockatrice/src/game/zones/card_zone_logic.h
@@ -10,18 +10,17 @@
 #include "../../client/translation.h"
 #include "../board/card_list.h"
 
-#include <QList>
 #include <QLoggingCategory>
 #include <QObject>
-#include <QString>
-#include <qtmetamacros.h>
-
-class CardItem;
 
 inline Q_LOGGING_CATEGORY(CardZoneLogicLog, "card_zone_logic");
 
 class PlayerLogic;
 class ZoneViewZone;
+class QMenu;
+class QAction;
+class QPainter;
+class CardDragItem;
 
 class CardZoneLogic : public QObject
 {
diff --git a/cockatrice/src/game/zones/hand_zone_logic.cpp b/cockatrice/src/game/zones/hand_zone_logic.cpp
index cea17d031..3bdd15902 100644
--- a/cockatrice/src/game/zones/hand_zone_logic.cpp
+++ b/cockatrice/src/game/zones/hand_zone_logic.cpp
@@ -3,9 +3,6 @@
 #include "../../game_graphics/board/card_item.h"
 #include "card_zone_algorithms.h"
 
-class PlayerLogic;
-class QObject;
-
 HandZoneLogic::HandZoneLogic(PlayerLogic *_player,
                              const QString &_name,
                              bool _hasCardAttr,
diff --git a/cockatrice/src/game/zones/hand_zone_logic.h b/cockatrice/src/game/zones/hand_zone_logic.h
index c7d63bc0d..400506248 100644
--- a/cockatrice/src/game/zones/hand_zone_logic.h
+++ b/cockatrice/src/game/zones/hand_zone_logic.h
@@ -8,12 +8,6 @@
 #define COCKATRICE_HAND_ZONE_LOGIC_H
 #include "card_zone_logic.h"
 
-#include <QString>
-#include <qtmetamacros.h>
-
-class PlayerLogic;
-class QObject;
-
 class HandZoneLogic : public CardZoneLogic
 {
     Q_OBJECT
diff --git a/cockatrice/src/game/zones/pile_zone_logic.cpp b/cockatrice/src/game/zones/pile_zone_logic.cpp
index 40af25cc5..0f374fb84 100644
--- a/cockatrice/src/game/zones/pile_zone_logic.cpp
+++ b/cockatrice/src/game/zones/pile_zone_logic.cpp
@@ -1,10 +1,6 @@
 #include "pile_zone_logic.h"
 
 #include "../../game_graphics/board/card_item.h"
-#include "../board/card_list.h"
-
-class PlayerLogic;
-class QObject;
 
 PileZoneLogic::PileZoneLogic(PlayerLogic *_player,
                              const QString &_name,
diff --git a/cockatrice/src/game/zones/pile_zone_logic.h b/cockatrice/src/game/zones/pile_zone_logic.h
index ed6841b75..522d99b89 100644
--- a/cockatrice/src/game/zones/pile_zone_logic.h
+++ b/cockatrice/src/game/zones/pile_zone_logic.h
@@ -8,12 +8,6 @@
 #define COCKATRICE_PILE_ZONE_LOGIC_H
 #include "card_zone_logic.h"
 
-#include <QString>
-#include <qtmetamacros.h>
-
-class PlayerLogic;
-class QObject;
-
 class PileZoneLogic : public CardZoneLogic
 {
 
diff --git a/cockatrice/src/game/zones/stack_zone_logic.cpp b/cockatrice/src/game/zones/stack_zone_logic.cpp
index 454274971..341d4b0e4 100644
--- a/cockatrice/src/game/zones/stack_zone_logic.cpp
+++ b/cockatrice/src/game/zones/stack_zone_logic.cpp
@@ -3,9 +3,6 @@
 #include "../../game_graphics/board/card_item.h"
 #include "card_zone_algorithms.h"
 
-class PlayerLogic;
-class QObject;
-
 StackZoneLogic::StackZoneLogic(PlayerLogic *_player,
                                const QString &_name,
                                bool _hasCardAttr,
diff --git a/cockatrice/src/game/zones/stack_zone_logic.h b/cockatrice/src/game/zones/stack_zone_logic.h
index 657d44ecf..cce4bd0fa 100644
--- a/cockatrice/src/game/zones/stack_zone_logic.h
+++ b/cockatrice/src/game/zones/stack_zone_logic.h
@@ -8,12 +8,6 @@
 #define COCKATRICE_STACK_ZONE_LOGIC_H
 #include "card_zone_logic.h"
 
-#include <QString>
-#include <qtmetamacros.h>
-
-class PlayerLogic;
-class QObject;
-
 class StackZoneLogic : public CardZoneLogic
 {
     Q_OBJECT
diff --git a/cockatrice/src/game/zones/table_zone_logic.cpp b/cockatrice/src/game/zones/table_zone_logic.cpp
index 07e4a759b..a4f033819 100644
--- a/cockatrice/src/game/zones/table_zone_logic.cpp
+++ b/cockatrice/src/game/zones/table_zone_logic.cpp
@@ -1,13 +1,6 @@
 #include "table_zone_logic.h"
 
 #include "../../game_graphics/board/card_item.h"
-#include "../board/card_list.h"
-#include "libcockatrice/card/card_info.h"
-
-#include <QPoint>
-
-class PlayerLogic;
-class QObject;
 
 TableZoneLogic::TableZoneLogic(PlayerLogic *_player,
                                const QString &_name,
diff --git a/cockatrice/src/game/zones/table_zone_logic.h b/cockatrice/src/game/zones/table_zone_logic.h
index 8078bfd05..6d8d64a20 100644
--- a/cockatrice/src/game/zones/table_zone_logic.h
+++ b/cockatrice/src/game/zones/table_zone_logic.h
@@ -8,12 +8,6 @@
 #define COCKATRICE_TABLE_ZONE_LOGIC_H
 #include "card_zone_logic.h"
 
-#include <QString>
-#include <qtmetamacros.h>
-
-class PlayerLogic;
-class QObject;
-
 class TableZoneLogic : public CardZoneLogic
 {
     Q_OBJECT
diff --git a/cockatrice/src/game/zones/view_zone_logic.cpp b/cockatrice/src/game/zones/view_zone_logic.cpp
index eb3b7715f..de00581d1 100644
--- a/cockatrice/src/game/zones/view_zone_logic.cpp
+++ b/cockatrice/src/game/zones/view_zone_logic.cpp
@@ -2,14 +2,8 @@
 
 #include "../../client/settings/cache_settings.h"
 #include "../../game_graphics/board/card_item.h"
-#include "../board/card_list.h"
 
-#include <QtGlobal>
 #include <libcockatrice/settings/interface_settings.h>
-
-class PlayerLogic;
-class QObject;
-
 /**
  * @param _player the player that the cards are revealed to.
  * @param _origZone the zone the cards were revealed from.
diff --git a/cockatrice/src/game/zones/view_zone_logic.h b/cockatrice/src/game/zones/view_zone_logic.h
index 6fae301e4..e3080d044 100644
--- a/cockatrice/src/game/zones/view_zone_logic.h
+++ b/cockatrice/src/game/zones/view_zone_logic.h
@@ -8,11 +8,6 @@
 #define COCKATRICE_VIEW_ZONE_LOGIC_H
 #include "card_zone_logic.h"
 
-#include <qtmetamacros.h>
-
-class PlayerLogic;
-class QObject;
-
 class ZoneViewZoneLogic : public CardZoneLogic
 {
     Q_OBJECT
diff --git a/cockatrice/src/game_graphics/board/abstract_card_drag_item.cpp b/cockatrice/src/game_graphics/board/abstract_card_drag_item.cpp
index 2e18fca2d..2f43591ac 100644
--- a/cockatrice/src/game_graphics/board/abstract_card_drag_item.cpp
+++ b/cockatrice/src/game_graphics/board/abstract_card_drag_item.cpp
@@ -2,20 +2,12 @@
 
 #include "../../client/settings/cache_settings.h"
 #include "../z_values.h"
-#include "abstract_card_item.h"
 
-#include <QBrush>
-#include <QColor>
 #include <QCursor>
+#include <QDebug>
 #include <QGraphicsSceneMouseEvent>
 #include <QPainter>
-#include <QPainterPath>
-#include <QTransform>
-#include <QtGlobal>
 #include <libcockatrice/settings/cards_display_settings.h>
-#include <qnamespace.h>
-
-class QPointF;
 
 const QColor GHOST_MASK = QColor(255, 255, 255, 50);
 
diff --git a/cockatrice/src/game_graphics/board/abstract_card_drag_item.h b/cockatrice/src/game_graphics/board/abstract_card_drag_item.h
index 18afdcbb8..1cbeb4fe7 100644
--- a/cockatrice/src/game_graphics/board/abstract_card_drag_item.h
+++ b/cockatrice/src/game_graphics/board/abstract_card_drag_item.h
@@ -7,17 +7,11 @@
 #ifndef ABSTRACTCARDDRAGITEM_H
 #define ABSTRACTCARDDRAGITEM_H
 
-#include "../card_dimensions.h"
-#include "graphics_item_type.h"
+#include "abstract_card_item.h"
 
-#include <QGraphicsItem>
-#include <QList>
-#include <QObject>
-#include <QPointF>
-#include <QRectF>
-#include <qtmetamacros.h>
-
-class AbstractCardItem;
+class QGraphicsScene;
+class CardZone;
+class CardInfo;
 
 class AbstractCardDragItem : public QObject, public QGraphicsItem
 {
diff --git a/cockatrice/src/game_graphics/board/abstract_card_item.cpp b/cockatrice/src/game_graphics/board/abstract_card_item.cpp
index a79c5873e..3969b7d03 100644
--- a/cockatrice/src/game_graphics/board/abstract_card_item.cpp
+++ b/cockatrice/src/game_graphics/board/abstract_card_item.cpp
@@ -3,42 +3,19 @@
 #include "../../client/settings/cache_settings.h"
 #include "../../interface/card_localization.h"
 #include "../../interface/card_picture_loader/card_picture_loader.h"
-#include "../card_dimensions.h"
 #include "../game_scene.h"
 #include "../z_values.h"
-#include "abstract_graphics_item.h"
-#include "libcockatrice/card/card_info.h"
-#include "libcockatrice/card/database/card_database_querier.h"
-#include "libcockatrice/card/printing/exact_card.h"
-#include "libcockatrice/utility/card_ref.h"
 
-#include <QBrush>
-#include <QChar>
 #include <QCursor>
-#include <QFlags>
-#include <QFont>
 #include <QGraphicsScene>
 #include <QGraphicsSceneMouseEvent>
-#include <QHash>
-#include <QLineF>
-#include <QList>
 #include <QPainter>
-#include <QPainterPath>
-#include <QPen>
-#include <QPixmap>
-#include <QPointF>
-#include <QRectF>
-#include <QTransform>
-#include <QVariant>
-#include <QtGlobal>
 #include <algorithm>
+#include <libcockatrice/card/database/card_database.h>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/settings/appearance_settings.h>
 #include <libcockatrice/settings/cards_display_settings.h>
 #include <libcockatrice/settings/debug_settings.h>
-#include <qnamespace.h>
-
-class QSizeF;
 
 AbstractCardItem::AbstractCardItem(QGraphicsItem *parent, const CardRef &cardRef, PlayerLogic *_owner, int _id)
     : ArrowTarget(_owner, parent), id(_id), cardRef(cardRef), tapped(false), facedown(false), tapAngle(0),
diff --git a/cockatrice/src/game_graphics/board/abstract_card_item.h b/cockatrice/src/game_graphics/board/abstract_card_item.h
index 385f9c32f..8cbe95282 100644
--- a/cockatrice/src/game_graphics/board/abstract_card_item.h
+++ b/cockatrice/src/game_graphics/board/abstract_card_item.h
@@ -8,22 +8,14 @@
 #define ABSTRACTCARDITEM_H
 
 #include "../animated_item.h"
+#include "../card_dimensions.h"
 #include "arrow_target.h"
 #include "graphics_item_type.h"
 
-#include <QColor>
-#include <QGraphicsItem>
-#include <QSizeF>
-#include <QString>
-#include <QtGlobal>
 #include <libcockatrice/card/printing/exact_card.h>
 #include <libcockatrice/utility/card_ref.h>
-#include <qtmetamacros.h>
 
 class PlayerLogic;
-class CardInfo;
-class QPainter;
-class QPoint;
 
 class AbstractCardItem : public ArrowTarget, public IAnimatedItem
 {
diff --git a/cockatrice/src/game_graphics/board/abstract_counter.cpp b/cockatrice/src/game_graphics/board/abstract_counter.cpp
index 8500b9c51..4ba04804f 100644
--- a/cockatrice/src/game_graphics/board/abstract_counter.cpp
+++ b/cockatrice/src/game_graphics/board/abstract_counter.cpp
@@ -2,33 +2,21 @@
 
 #include "../../client/settings/cache_settings.h"
 #include "../../client/settings/shortcuts_settings.h"
-#include "../../game/board/counter_state.h"
 #include "../../game/player/player_actions.h"
-#include "../../game/player/player_info.h"
 #include "../../game/player/player_logic.h"
 #include "../../game_graphics/board/translate_counter_name.h"
-#include "../../interface/widgets/menus/tearoff_menu.h"
+#include "../../interface/widgets/tabs/tab_game.h"
 
 #include <QAction>
 #include <QApplication>
-#include <QEvent>
-#include <QFlags>
-#include <QGraphicsScene>
 #include <QGraphicsSceneMouseEvent>
 #include <QGraphicsView>
 #include <QKeyEvent>
-#include <QKeySequence>
-#include <QList>
-#include <QSharedPointer>
+#include <QMenu>
 #include <QString>
-#include <QVariant>
-#include <QtGlobal>
 #include <libcockatrice/protocol/pb/command_inc_counter.pb.h>
 #include <libcockatrice/protocol/pb/command_set_counter.pb.h>
 #include <libcockatrice/utility/expression.h>
-#include <qnamespace.h>
-
-class QWidget;
 
 AbstractCounter::AbstractCounter(CounterState *state,
                                  PlayerLogic *_player,
diff --git a/cockatrice/src/game_graphics/board/abstract_counter.h b/cockatrice/src/game_graphics/board/abstract_counter.h
index 7ba686a93..67b5b4074 100644
--- a/cockatrice/src/game_graphics/board/abstract_counter.h
+++ b/cockatrice/src/game_graphics/board/abstract_counter.h
@@ -7,21 +7,18 @@
 #ifndef COUNTER_H
 #define COUNTER_H
 
+#include "../../game/board/counter_state.h"
 #include "../../interface/widgets/menus/tearoff_menu.h"
 #include "../player/menu/abstract_player_component.h"
 
-#include <QColor>
 #include <QGraphicsItem>
 #include <QInputDialog>
-#include <QObject>
-#include <QString>
-#include <qtmetamacros.h>
 
 class PlayerLogic;
 class QAction;
+class QKeyEvent;
 class QMenu;
-class CounterState;
-class QWidget;
+class QString;
 
 class AbstractCounter : public QObject, public QGraphicsItem, public AbstractPlayerComponent
 {
diff --git a/cockatrice/src/game_graphics/board/abstract_graphics_item.cpp b/cockatrice/src/game_graphics/board/abstract_graphics_item.cpp
index 50e80d359..8da8ab708 100644
--- a/cockatrice/src/game_graphics/board/abstract_graphics_item.cpp
+++ b/cockatrice/src/game_graphics/board/abstract_graphics_item.cpp
@@ -1,14 +1,6 @@
 #include "abstract_graphics_item.h"
 
-#include <QBrush>
-#include <QFont>
-#include <QFontMetrics>
 #include <QPainter>
-#include <QRectF>
-#include <QString>
-#include <QTransform>
-#include <QtGlobal>
-#include <qnamespace.h>
 
 void AbstractGraphicsItem::paintNumberEllipse(int number,
                                               int fontSize,
diff --git a/cockatrice/src/game_graphics/board/abstract_graphics_item.h b/cockatrice/src/game_graphics/board/abstract_graphics_item.h
index ebc2a3761..287c2c0b3 100644
--- a/cockatrice/src/game_graphics/board/abstract_graphics_item.h
+++ b/cockatrice/src/game_graphics/board/abstract_graphics_item.h
@@ -7,12 +7,7 @@
 #ifndef ABSTRACTGRAPHICSITEM_H
 #define ABSTRACTGRAPHICSITEM_H
 
-#include <QColor>
-#include <QGraphicsObject>
-#include <qtmetamacros.h>
-
-class QGraphicsItem;
-class QPainter;
+#include <QGraphicsItem>
 
 /**
  * Parent class of all objects that appear in a game.
diff --git a/cockatrice/src/game_graphics/board/arrow_item.cpp b/cockatrice/src/game_graphics/board/arrow_item.cpp
index c5a9b9c5e..664d44ecc 100644
--- a/cockatrice/src/game_graphics/board/arrow_item.cpp
+++ b/cockatrice/src/game_graphics/board/arrow_item.cpp
@@ -2,42 +2,28 @@
 #include "arrow_item.h"
 
 #include "../../client/settings/cache_settings.h"
-#include "../../game/board/arrow_data.h"
 #include "../../game/player/player_actions.h"
-#include "../../game/player/player_info.h"
 #include "../../game/player/player_logic.h"
-#include "../../game/zones/card_zone_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 "libcockatrice/card/printing/exact_card.h"
-#include "libcockatrice/protocol/pb/color.pb.h"
 
-#include <QBrush>
+#include <QDebug>
 #include <QElapsedTimer>
 #include <QGraphicsScene>
 #include <QGraphicsSceneMouseEvent>
-#include <QLineF>
-#include <QLinearGradient>
 #include <QPainter>
-#include <QPen>
-#include <QPoint>
-#include <QString>
-#include <QTransform>
-#include <QtGlobal>
 #include <QtMath>
 #include <libcockatrice/card/card_info.h>
 #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>
-#include <math.h>
-#include <qnamespace.h>
-#include <string>
-#include <utility>
 
 namespace
 {
diff --git a/cockatrice/src/game_graphics/board/arrow_item.h b/cockatrice/src/game_graphics/board/arrow_item.h
index 2395165fc..76a2d5d6c 100644
--- a/cockatrice/src/game_graphics/board/arrow_item.h
+++ b/cockatrice/src/game_graphics/board/arrow_item.h
@@ -6,23 +6,15 @@
 #include "arrow_target.h"
 #include "graphics_item_type.h"
 
-#include <QColor>
 #include <QElapsedTimer>
 #include <QGraphicsItem>
-#include <QList>
-#include <QMetaObject>
-#include <QObject>
 #include <QPainterPath>
-#include <QPointF>
 #include <QPointer>
-#include <QRectF>
 #include <QSharedPointer>
-#include <QtGlobal>
-#include <qtmetamacros.h>
 
 class CardItem;
+class QGraphicsSceneMouseEvent;
 class PlayerLogic;
-template <class T> class QSharedPointer;
 
 class ArrowItem : public QObject, public QGraphicsItem, public IAnimatedItem
 {
diff --git a/cockatrice/src/game_graphics/board/arrow_target.cpp b/cockatrice/src/game_graphics/board/arrow_target.cpp
index 024479ee6..79b21d921 100644
--- a/cockatrice/src/game_graphics/board/arrow_target.cpp
+++ b/cockatrice/src/game_graphics/board/arrow_target.cpp
@@ -1,8 +1,7 @@
 #include "arrow_target.h"
 
-#include <QVariant>
-
-class QGraphicsItem;
+#include "../../game/player/player_logic.h"
+#include "arrow_item.h"
 
 ArrowTarget::ArrowTarget(PlayerLogic *_owner, QGraphicsItem *parent) : AbstractGraphicsItem(parent), owner(_owner)
 {
diff --git a/cockatrice/src/game_graphics/board/arrow_target.h b/cockatrice/src/game_graphics/board/arrow_target.h
index 5c55e0e5d..bf89c5456 100644
--- a/cockatrice/src/game_graphics/board/arrow_target.h
+++ b/cockatrice/src/game_graphics/board/arrow_target.h
@@ -9,10 +9,10 @@
 
 #include "abstract_graphics_item.h"
 
-#include <qtmetamacros.h>
+#include <QList>
 
 class PlayerLogic;
-class QGraphicsItem;
+class ArrowItem;
 
 class ArrowTarget : public AbstractGraphicsItem
 {
diff --git a/cockatrice/src/game_graphics/board/card_drag_item.cpp b/cockatrice/src/game_graphics/board/card_drag_item.cpp
index 265ea759c..49467c5c9 100644
--- a/cockatrice/src/game_graphics/board/card_drag_item.cpp
+++ b/cockatrice/src/game_graphics/board/card_drag_item.cpp
@@ -6,20 +6,9 @@
 #include "../zones/view_zone.h"
 #include "card_item.h"
 
-#include <QBrush>
-#include <QColor>
 #include <QCursor>
-#include <QGraphicsItem>
-#include <QGraphicsScene>
 #include <QGraphicsSceneMouseEvent>
-#include <QList>
-#include <QObject>
 #include <QPainter>
-#include <QPoint>
-#include <QSharedPointer>
-#include <qnamespace.h>
-
-class CardZoneLogic;
 
 CardDragItem::CardDragItem(CardItem *_item,
                            int _id,
diff --git a/cockatrice/src/game_graphics/board/card_drag_item.h b/cockatrice/src/game_graphics/board/card_drag_item.h
index d5e9a9e83..74d25ad04 100644
--- a/cockatrice/src/game_graphics/board/card_drag_item.h
+++ b/cockatrice/src/game_graphics/board/card_drag_item.h
@@ -9,11 +9,7 @@
 
 #include "abstract_card_drag_item.h"
 
-#include <QPointF>
-#include <qtmetamacros.h>
-
 class CardItem;
-class CardZone;
 
 class CardDragItem : public AbstractCardDragItem
 {
diff --git a/cockatrice/src/game_graphics/board/card_item.cpp b/cockatrice/src/game_graphics/board/card_item.cpp
index a04d86c15..c2dc455cc 100644
--- a/cockatrice/src/game_graphics/board/card_item.cpp
+++ b/cockatrice/src/game_graphics/board/card_item.cpp
@@ -1,52 +1,26 @@
 #include "card_item.h"
 
 #include "../../client/settings/cache_settings.h"
-#include "../../game/abstract_game.h"
-#include "../../game/board/card_state.h"
-#include "../../game/game_state.h"
+#include "../../client/settings/card_counter_settings.h"
 #include "../../game/phase.h"
 #include "../../game/player/player_actions.h"
-#include "../../game/player/player_info.h"
 #include "../../game/player/player_logic.h"
-#include "../../game/player/player_manager.h"
-#include "../../game/zones/card_zone_logic.h"
-#include "../../game/zones/table_zone_logic.h"
 #include "../../game/zones/view_zone_logic.h"
-#include "../card_dimensions.h"
+#include "../../interface/widgets/tabs/tab_game.h"
 #include "../game_scene.h"
+#include "../zones/table_zone.h"
+#include "../zones/view_zone.h"
 #include "arrow_item.h"
 #include "card_drag_item.h"
-#include "libcockatrice/card/printing/exact_card.h"
-#include "libcockatrice/protocol/pb/serverinfo_cardcounter.pb.h"
 
 #include <../../client/settings/card_counter_settings.h>
 #include <QApplication>
-#include <QBrush>
-#include <QChar>
-#include <QColor>
-#include <QCursor>
-#include <QFlags>
-#include <QGraphicsItem>
-#include <QGraphicsScene>
 #include <QGraphicsSceneMouseEvent>
-#include <QMap>
-#include <QMapIterator>
-#include <QObject>
+#include <QMenu>
 #include <QPainter>
-#include <QPen>
-#include <QRectF>
-#include <QSharedPointer>
-#include <QSizeF>
-#include <QTransform>
-#include <QVariant>
-#include <QtGlobal>
 #include <libcockatrice/card/card_info.h>
 #include <libcockatrice/protocol/pb/serverinfo_card.pb.h>
 #include <libcockatrice/settings/interface_settings.h>
-#include <libcockatrice/utility/card_ref.h>
-#include <qnamespace.h>
-
-struct CardRef;
 
 CardItem::CardItem(PlayerLogic *_owner,
                    QGraphicsItem *parent,
diff --git a/cockatrice/src/game_graphics/board/card_item.h b/cockatrice/src/game_graphics/board/card_item.h
index df79ef378..2ba43d03d 100644
--- a/cockatrice/src/game_graphics/board/card_item.h
+++ b/cockatrice/src/game_graphics/board/card_item.h
@@ -8,24 +8,18 @@
 #define CARDITEM_H
 
 #include "../../game/board/card_state.h"
+#include "../../game/zones/card_zone_logic.h"
 #include "abstract_card_item.h"
-#include "graphics_item_type.h"
 
-#include <QList>
-#include <QPoint>
-#include <QPointF>
-#include <QString>
-#include <QVariantList>
-#include <qtmetamacros.h>
+#include <libcockatrice/network/server/remote/game/server_card.h>
 
+class CardDatabase;
 class CardDragItem;
+class CardZone;
 class ServerInfo_Card;
 class PlayerLogic;
+class QAction;
 class QColor;
-class CardZoneLogic;
-class QGraphicsItem;
-struct CardRef;
-template <class Key, class T> class QMap;
 
 const int ROTATION_DEGREES_PER_FRAME = 10;
 
diff --git a/cockatrice/src/game_graphics/board/counter_general.cpp b/cockatrice/src/game_graphics/board/counter_general.cpp
index 4a8bbd6a4..379c6f837 100644
--- a/cockatrice/src/game_graphics/board/counter_general.cpp
+++ b/cockatrice/src/game_graphics/board/counter_general.cpp
@@ -3,20 +3,7 @@
 #include "../../interface/pixel_map_generator.h"
 #include "abstract_graphics_item.h"
 
-#include <QFont>
 #include <QPainter>
-#include <QPixmap>
-#include <QPoint>
-#include <QRectF>
-#include <QSizeF>
-#include <QString>
-#include <QTransform>
-#include <QtGlobal>
-#include <qnamespace.h>
-
-class CounterState;
-class PlayerLogic;
-class QGraphicsItem;
 
 GeneralCounter::GeneralCounter(CounterState *state, PlayerLogic *player, bool useNameForShortcut, QGraphicsItem *parent)
     : AbstractCounter(state, player, true, useNameForShortcut, parent)
diff --git a/cockatrice/src/game_graphics/board/counter_general.h b/cockatrice/src/game_graphics/board/counter_general.h
index 2e49f11d7..0a2e882ce 100644
--- a/cockatrice/src/game_graphics/board/counter_general.h
+++ b/cockatrice/src/game_graphics/board/counter_general.h
@@ -9,12 +9,6 @@
 
 #include "abstract_counter.h"
 
-#include <qtmetamacros.h>
-
-class CounterState;
-class PlayerLogic;
-class QGraphicsItem;
-
 class GeneralCounter : public AbstractCounter
 {
     Q_OBJECT
diff --git a/cockatrice/src/game_graphics/board/translate_counter_name.cpp b/cockatrice/src/game_graphics/board/translate_counter_name.cpp
index 3a2a5c7c8..4f1c97657 100644
--- a/cockatrice/src/game_graphics/board/translate_counter_name.cpp
+++ b/cockatrice/src/game_graphics/board/translate_counter_name.cpp
@@ -1,8 +1,5 @@
 #include "translate_counter_name.h"
 
-#include <QtGlobal>
-#include <utility>
-
 const QMap<QString, QString> TranslateCounterName::translated = {
     {"life", QT_TRANSLATE_NOOP("TranslateCounterName", "Life")},
     {"w", QT_TRANSLATE_NOOP("TranslateCounterName", "White")},
diff --git a/cockatrice/src/game_graphics/board/translate_counter_name.h b/cockatrice/src/game_graphics/board/translate_counter_name.h
index e7e42e5fc..ba3a94fa5 100644
--- a/cockatrice/src/game_graphics/board/translate_counter_name.h
+++ b/cockatrice/src/game_graphics/board/translate_counter_name.h
@@ -7,10 +7,8 @@
 #ifndef TRANSLATECOUNTERNAME_H
 #define TRANSLATECOUNTERNAME_H
 
-#include <QByteArray>
-#include <QCoreApplication>
-#include <QMap>
 #include <QString>
+#include <QtCore>
 
 class TranslateCounterName
 {
diff --git a/cockatrice/src/game_graphics/deckview/deck_view.cpp b/cockatrice/src/game_graphics/deckview/deck_view.cpp
index c86bc9925..1acd02a75 100644
--- a/cockatrice/src/game_graphics/deckview/deck_view.cpp
+++ b/cockatrice/src/game_graphics/deckview/deck_view.cpp
@@ -2,47 +2,15 @@
 
 #include "../../client/settings/cache_settings.h"
 #include "../../interface/theme_manager.h"
-#include "../board/abstract_card_drag_item.h"
-#include "../card_dimensions.h"
-#include "libcockatrice/card/printing/exact_card.h"
-#include "libcockatrice/deck_list/tree/deck_list_card_node.h"
-#include "libcockatrice/deck_list/tree/inner_deck_list_node.h"
-#include "libcockatrice/protocol/pb/move_card_to_zone.pb.h"
 
 #include <QApplication>
-#include <QBrush>
-#include <QColor>
-#include <QCursor>
-#include <QFlags>
-#include <QFont>
-#include <QFontMetrics>
-#include <QGraphicsSceneHoverEvent>
 #include <QGraphicsSceneMouseEvent>
-#include <QMapIterator>
 #include <QMouseEvent>
-#include <QPainter>
-#include <QPen>
-#include <QPoint>
-#include <QSet>
-#include <QSharedPointer>
-#include <QSize>
-#include <QStringList>
-#include <QtGlobal>
 #include <QtMath>
 #include <algorithm>
-#include <compare>
 #include <libcockatrice/card/card_info.h>
 #include <libcockatrice/deck_list/deck_list.h>
 #include <libcockatrice/settings/cards_display_settings.h>
-#include <libcockatrice/utility/card_ref.h>
-#include <qnamespace.h>
-#include <string>
-#include <utility>
-
-class QObject;
-class QRectF;
-class QWidget;
-struct CardRef;
 
 DeckViewCardDragItem::DeckViewCardDragItem(DeckViewCard *_item,
                                            const QPointF &_hotSpot,
diff --git a/cockatrice/src/game_graphics/deckview/deck_view.h b/cockatrice/src/game_graphics/deckview/deck_view.h
index 3b5b4b6f4..f996fd4da 100644
--- a/cockatrice/src/game_graphics/deckview/deck_view.h
+++ b/cockatrice/src/game_graphics/deckview/deck_view.h
@@ -8,30 +8,17 @@
 #define DECKVIEW_H
 
 #include "../board/abstract_card_drag_item.h"
-#include "../board/abstract_card_item.h"
-#include "../board/graphics_item_type.h"
 
-#include <QGraphicsItem>
-#include <QGraphicsScene>
 #include <QGraphicsView>
-#include <QList>
 #include <QMap>
-#include <QMultiMap>
-#include <QPair>
-#include <QPointF>
-#include <QRectF>
-#include <QSizeF>
-#include <QString>
-#include <QtGlobal>
 #include <libcockatrice/protocol/pb/move_card_to_zone.pb.h>
-#include <qtmetamacros.h>
 
 class DeckList;
+class InnerDecklistNode;
+class CardInfo;
 class DeckViewCardContainer;
 class DeckViewCardDragItem;
-class QObject;
-class QWidget;
-struct CardRef;
+class MoveCardToZone;
 
 class DeckViewCard : public AbstractCardItem
 {
diff --git a/cockatrice/src/game_graphics/deckview/deck_view_container.cpp b/cockatrice/src/game_graphics/deckview/deck_view_container.cpp
index c97767ec7..bc07ac183 100644
--- a/cockatrice/src/game_graphics/deckview/deck_view_container.cpp
+++ b/cockatrice/src/game_graphics/deckview/deck_view_container.cpp
@@ -2,36 +2,18 @@
 
 #include "../../client/settings/cache_settings.h"
 #include "../../client/settings/shortcuts_settings.h"
-#include "../../game/abstract_game.h"
-#include "../../game/game_event_handler.h"
-#include "../../game/game_state.h"
 #include "../../interface/card_picture_loader/card_picture_loader.h"
-#include "../../interface/deck_loader/deck_file_format.h"
 #include "../../interface/deck_loader/deck_loader.h"
-#include "../../interface/deck_loader/loaded_deck.h"
 #include "../../interface/widgets/dialogs/dlg_load_deck.h"
 #include "../../interface/widgets/dialogs/dlg_load_deck_from_clipboard.h"
 #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 "../board/abstract_card_item.h"
 #include "deck_view.h"
-#include "libcockatrice/card/database/card_database_querier.h"
-#include "libcockatrice/card/printing/exact_card.h"
-#include "libcockatrice/interfaces/interface_interface_settings_provider.h"
-#include "libcockatrice/protocol/pb/move_card_to_zone.pb.h"
-#include "libcockatrice/protocol/pb/response.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_playerproperties.pb.h"
-#include "libcockatrice/utility/card_ref.h"
 
-#include <QHBoxLayout>
-#include <QList>
 #include <QMessageBox>
-#include <QPainter>
-#include <QPen>
-#include <QRect>
-#include <QVBoxLayout>
+#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>
@@ -44,9 +26,6 @@
 #include <libcockatrice/settings/interface_settings.h>
 #include <libcockatrice/settings/visual_deck_storage_settings.h>
 #include <libcockatrice/utility/string_limits.h>
-#include <optional>
-#include <qnamespace.h>
-#include <string>
 
 ToggleButton::ToggleButton(QWidget *parent) : QPushButton(parent), state(false)
 {
diff --git a/cockatrice/src/game_graphics/deckview/deck_view_container.h b/cockatrice/src/game_graphics/deckview/deck_view_container.h
index 80b82b6e5..b5317c39a 100644
--- a/cockatrice/src/game_graphics/deckview/deck_view_container.h
+++ b/cockatrice/src/game_graphics/deckview/deck_view_container.h
@@ -7,17 +7,14 @@
 #ifndef DECK_VIEW_CONTAINER_H
 #define DECK_VIEW_CONTAINER_H
 
-#include "libcockatrice/deck_list/deck_list.h"
-#include "libcockatrice/utility/playmat_params.h"
+#include "../../interface/deck_loader/deck_loader.h"
 
 #include <QPushButton>
-#include <QString>
-#include <QWidget>
-#include <qtmetamacros.h>
 
 class QVBoxLayout;
 class AbstractCardItem;
 class VisualDeckStorageWidget;
+class DeckPreviewWidget;
 class Response;
 class TabGame;
 class DeckView;
diff --git a/cockatrice/src/game_graphics/deckview/tabbed_deck_view_container.cpp b/cockatrice/src/game_graphics/deckview/tabbed_deck_view_container.cpp
index 90cbed9a1..2ffb214f7 100644
--- a/cockatrice/src/game_graphics/deckview/tabbed_deck_view_container.cpp
+++ b/cockatrice/src/game_graphics/deckview/tabbed_deck_view_container.cpp
@@ -1,15 +1,7 @@
 #include "tabbed_deck_view_container.h"
 
-#include "../board/abstract_card_item.h"
+#include "../../interface/widgets/tabs/tab_game.h"
 #include "deck_view.h"
-#include "deck_view_container.h"
-
-#include <QSharedPointer>
-#include <QTabBar>
-#include <QWidget>
-
-class DeckList;
-class TabGame;
 
 TabbedDeckViewContainer::TabbedDeckViewContainer(int _playerId, TabGame *parent)
     : QTabWidget(nullptr), playerId(_playerId), parentGame(parent)
diff --git a/cockatrice/src/game_graphics/deckview/tabbed_deck_view_container.h b/cockatrice/src/game_graphics/deckview/tabbed_deck_view_container.h
index 7d73b78a2..7cfa8c9aa 100644
--- a/cockatrice/src/game_graphics/deckview/tabbed_deck_view_container.h
+++ b/cockatrice/src/game_graphics/deckview/tabbed_deck_view_container.h
@@ -6,15 +6,9 @@
 
 #ifndef TABBED_DECK_VIEW_CONTAINER_H
 #define TABBED_DECK_VIEW_CONTAINER_H
-#include <QMap>
-#include <QString>
-#include <QTabWidget>
-#include <qtmetamacros.h>
+#include "deck_view_container.h"
 
-class DeckList;
-class DeckView;
-class DeckViewContainer;
-class TabGame;
+#include <QTabWidget>
 
 class TabbedDeckViewContainer : public QTabWidget
 {
diff --git a/cockatrice/src/game_graphics/dialogs/dlg_create_token.cpp b/cockatrice/src/game_graphics/dialogs/dlg_create_token.cpp
index 5ce050380..6d8ad0534 100644
--- a/cockatrice/src/game_graphics/dialogs/dlg_create_token.cpp
+++ b/cockatrice/src/game_graphics/dialogs/dlg_create_token.cpp
@@ -2,30 +2,23 @@
 
 #include "../../client/settings/cache_settings.h"
 #include "../../interface/widgets/cards/card_info_picture_widget.h"
-#include "libcockatrice/card/card_info.h"
-#include "libcockatrice/card/database/card_database_querier.h"
+#include "../../main.h"
 
-#include <QByteArray>
-#include <QChar>
 #include <QCheckBox>
 #include <QCloseEvent>
 #include <QComboBox>
 #include <QDialogButtonBox>
 #include <QGridLayout>
 #include <QGroupBox>
+#include <QHBoxLayout>
 #include <QHeaderView>
-#include <QItemSelectionModel>
 #include <QLabel>
 #include <QLineEdit>
-#include <QModelIndex>
 #include <QRadioButton>
-#include <QSet>
-#include <QTimer>
 #include <QTreeView>
-#include <QVBoxLayout>
-#include <QVariant>
 #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>
@@ -33,10 +26,6 @@
 #include <libcockatrice/settings/interface_settings.h>
 #include <libcockatrice/settings/layouts_settings.h>
 #include <libcockatrice/utility/string_limits.h>
-#include <qnamespace.h>
-
-class QModelIndex;
-class QWidget;
 
 DlgCreateToken::DlgCreateToken(const QStringList &_predefinedTokens, QWidget *parent)
     : QDialog(parent), predefinedTokens(_predefinedTokens)
diff --git a/cockatrice/src/game_graphics/dialogs/dlg_create_token.h b/cockatrice/src/game_graphics/dialogs/dlg_create_token.h
index a03a1046b..281e161fc 100644
--- a/cockatrice/src/game_graphics/dialogs/dlg_create_token.h
+++ b/cockatrice/src/game_graphics/dialogs/dlg_create_token.h
@@ -8,22 +8,19 @@
 #define DLG_CREATETOKEN_H
 
 #include <QDialog>
-#include <QList>
-#include <QString>
-#include <QStringList>
-#include <qtmetamacros.h>
 
 class QLabel;
 class QLineEdit;
 class QComboBox;
 class QCheckBox;
+class QPushButton;
 class QRadioButton;
+class QCloseEvent;
 class QTreeView;
+class DeckList;
 class CardDatabaseModel;
 class TokenDisplayModel;
 class CardInfoPictureWidget;
-class QModelIndex;
-class QWidget;
 
 struct TokenInfo
 {
diff --git a/cockatrice/src/game_graphics/dialogs/dlg_move_top_cards_until.cpp b/cockatrice/src/game_graphics/dialogs/dlg_move_top_cards_until.cpp
index b7cd73d79..41c907163 100644
--- a/cockatrice/src/game_graphics/dialogs/dlg_move_top_cards_until.cpp
+++ b/cockatrice/src/game_graphics/dialogs/dlg_move_top_cards_until.cpp
@@ -1,24 +1,17 @@
 #include "dlg_move_top_cards_until.h"
 
-#include "libcockatrice/card/card_info.h"
-
-#include <QCheckBox>
-#include <QComboBox>
 #include <QCompleter>
 #include <QDialogButtonBox>
-#include <QGridLayout>
 #include <QLabel>
+#include <QLineEdit>
 #include <QMessageBox>
 #include <QSpinBox>
 #include <QString>
 #include <QVBoxLayout>
-#include <algorithm>
+#include <QWidget>
 #include <libcockatrice/card/database/card_database.h>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/filters/filter_string.h>
-#include <qnamespace.h>
-
-class QWidget;
 
 DlgMoveTopCardsUntil::DlgMoveTopCardsUntil(QWidget *parent, const MoveTopCardsUntilOptions &options) : QDialog(parent)
 {
diff --git a/cockatrice/src/game_graphics/dialogs/dlg_move_top_cards_until.h b/cockatrice/src/game_graphics/dialogs/dlg_move_top_cards_until.h
index b9080bcc1..ac9d41a94 100644
--- a/cockatrice/src/game_graphics/dialogs/dlg_move_top_cards_until.h
+++ b/cockatrice/src/game_graphics/dialogs/dlg_move_top_cards_until.h
@@ -7,19 +7,14 @@
 #ifndef DLG_MOVE_TOP_CARDS_UNTIL_H
 #define DLG_MOVE_TOP_CARDS_UNTIL_H
 
+#include <QCheckBox>
+#include <QComboBox>
 #include <QDialog>
-#include <QList>
-#include <QString>
-#include <QStringList>
-#include <qtmetamacros.h>
+#include <QDialogButtonBox>
+#include <QLabel>
+#include <QSpinBox>
 
 class FilterString;
-class QCheckBox;
-class QComboBox;
-class QDialogButtonBox;
-class QLabel;
-class QSpinBox;
-class QWidget;
 
 struct MoveTopCardsUntilOptions
 {
diff --git a/cockatrice/src/game_graphics/dialogs/dlg_roll_dice.cpp b/cockatrice/src/game_graphics/dialogs/dlg_roll_dice.cpp
index b17881211..4f5d5b861 100644
--- a/cockatrice/src/game_graphics/dialogs/dlg_roll_dice.cpp
+++ b/cockatrice/src/game_graphics/dialogs/dlg_roll_dice.cpp
@@ -1,15 +1,12 @@
 #include "dlg_roll_dice.h"
 
 #include <QDialogButtonBox>
-#include <QGridLayout>
 #include <QLabel>
 #include <QSpinBox>
-#include <QString>
 #include <QVBoxLayout>
+#include <QWidget>
 #include <libcockatrice/utility/dice_limits.h>
 
-class QWidget;
-
 DlgRollDice::DlgRollDice(QWidget *parent) : QDialog(parent)
 {
     numberOfSidesLabel = new QLabel(tr("Number of sides:"));
diff --git a/cockatrice/src/game_graphics/dialogs/dlg_roll_dice.h b/cockatrice/src/game_graphics/dialogs/dlg_roll_dice.h
index 4c146a054..15f7dc1ba 100644
--- a/cockatrice/src/game_graphics/dialogs/dlg_roll_dice.h
+++ b/cockatrice/src/game_graphics/dialogs/dlg_roll_dice.h
@@ -8,13 +8,9 @@
 #define DLG_ROLL_DICE_H
 
 #include <QDialog>
-#include <qtmetamacros.h>
-#include <sys/types.h>
-
-class QDialogButtonBox;
-class QLabel;
-class QSpinBox;
-class QWidget;
+#include <QDialogButtonBox>
+#include <QLabel>
+#include <QSpinBox>
 
 class DlgRollDice : public QDialog
 {
diff --git a/cockatrice/src/game_graphics/game_scene.cpp b/cockatrice/src/game_graphics/game_scene.cpp
index cc3f9f1d3..e4466f95d 100644
--- a/cockatrice/src/game_graphics/game_scene.cpp
+++ b/cockatrice/src/game_graphics/game_scene.cpp
@@ -2,50 +2,25 @@
 
 #include "../client/settings/cache_settings.h"
 #include "../game/abstract_game.h"
-#include "../game/arrow_registry.h"
-#include "../game/board/arrow_data.h"
 #include "../game/player/player_actions.h"
-#include "../game/player/player_event_handler.h"
-#include "../game/player/player_info.h"
 #include "../game/player/player_logic.h"
-#include "../game/zones/card_zone_logic.h"
-#include "../game/zones/view_zone_logic.h"
-#include "animated_item.h"
-#include "board/abstract_card_item.h"
-#include "board/arrow_item.h"
+#include "../game_graphics/player/player_graphics_item.h"
 #include "board/card_item.h"
 #include "phases_toolbar.h"
 #include "player/menu/player_menu.h"
 #include "player/player_graphics_item.h"
-#include "player/player_target.h"
-#include "zones/card_zone.h"
 #include "zones/select_zone.h"
 #include "zones/view_zone.h"
 #include "zones/view_zone_widget.h"
 
 #include <QBasicTimer>
 #include <QDebug>
-#include <QEvent>
-#include <QGraphicsItem>
 #include <QGraphicsSceneMouseEvent>
 #include <QGraphicsView>
-#include <QListIterator>
-#include <QMenu>
-#include <QMessageLogger>
-#include <QMutableHashIterator>
-#include <QObject>
-#include <QPoint>
-#include <QRectF>
-#include <QSet>
-#include <QSharedPointer>
 #include <QtMath>
-#include <algorithm>
 #include <libcockatrice/settings/interface_settings.h>
 #include <libcockatrice/utility/zone_names.h>
 #include <numeric>
-#include <qnamespace.h>
-
-class ArrowTarget;
 
 /**
  * @brief Constructs the GameScene.
diff --git a/cockatrice/src/game_graphics/game_scene.h b/cockatrice/src/game_graphics/game_scene.h
index c7cae1e76..cf81eec9d 100644
--- a/cockatrice/src/game_graphics/game_scene.h
+++ b/cockatrice/src/game_graphics/game_scene.h
@@ -2,33 +2,16 @@
 #define GAMESCENE_H
 
 #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 <QMap>
-#include <QMetaObject>
-#include <QPointF>
 #include <QPointer>
-#include <QSize>
-#include <QSizeF>
-#include <QString>
-#include <QTransform>
-#include <QtGlobal>
-#include <qtmetamacros.h>
-
-// IWYU pragma: keep
-// ServerInfo_Card appears inside QList<...> in signal and slot
-// signatures, which the moc-generated code needs to be complete.
-#include <libcockatrice/protocol/pb/serverinfo_card.pb.h>
-
-class CardZoneLogic;
-class IAnimatedItem;
-class QGraphicsItem;
-class QPoint;
-struct ArrowData;
-template <class T> class QSharedPointer;
 
 inline Q_LOGGING_CATEGORY(GameSceneLog, "game_scene");
 inline Q_LOGGING_CATEGORY(GameScenePlayerAdditionRemovalLog, "game_scene.player_addition_removal");
diff --git a/cockatrice/src/game_graphics/game_view.cpp b/cockatrice/src/game_graphics/game_view.cpp
index 1c92d74ae..ed6355157 100644
--- a/cockatrice/src/game_graphics/game_view.cpp
+++ b/cockatrice/src/game_graphics/game_view.cpp
@@ -5,24 +5,13 @@
 #include "game_scene.h"
 
 #include <QAction>
-#include <QBrush>
-#include <QColor>
-#include <QEvent>
-#include <QGraphicsScene>
 #include <QGridLayout>
 #include <QLabel>
-#include <QMargins>
-#include <QPainter>
-#include <QPoint>
+#include <QLayout>
 #include <QResizeEvent>
 #include <QRubberBand>
-#include <QString>
-#include <QStringLiteral>
-#include <QWidget>
-#include <QtGlobal>
 #include <libcockatrice/settings/interface_settings.h>
 #include <libcockatrice/utility/qt_utils.h>
-#include <qnamespace.h>
 
 // QRubberBand calls raise() in showEvent() and changeEvent() to stay on top of siblings.
 // This subclass disables that behavior so dragCountLabel can appear above it.
diff --git a/cockatrice/src/game_graphics/game_view.h b/cockatrice/src/game_graphics/game_view.h
index e57267734..a23655513 100644
--- a/cockatrice/src/game_graphics/game_view.h
+++ b/cockatrice/src/game_graphics/game_view.h
@@ -10,19 +10,11 @@
 #include "tally/tally.h"
 
 #include <QGraphicsView>
-#include <QList>
-#include <QPointF>
-#include <QRect>
-#include <QRectF>
-#include <QSize>
-#include <qtmetamacros.h>
 
 class GameScene;
 class QGridLayout;
 class QLabel;
 class QRubberBand;
-class QAction;
-class QWidget;
 
 class GameView : public QGraphicsView
 {
diff --git a/cockatrice/src/game_graphics/hand_counter.cpp b/cockatrice/src/game_graphics/hand_counter.cpp
index 9320c1295..8dcbcfdaa 100644
--- a/cockatrice/src/game_graphics/hand_counter.cpp
+++ b/cockatrice/src/game_graphics/hand_counter.cpp
@@ -1,22 +1,11 @@
 #include "hand_counter.h"
 
-#include "../game/board/card_list.h"
-#include "../game/zones/card_zone_logic.h"
 #include "../interface/pixel_map_generator.h"
+#include "zones/card_zone.h"
 
 #include <QGraphicsSceneMouseEvent>
 #include <QPainter>
-#include <QPixmap>
 #include <QPixmapCache>
-#include <QRectF>
-#include <QSize>
-#include <QSizeF>
-#include <QString>
-#include <QStringLiteral>
-#include <QTransform>
-#include <qnamespace.h>
-
-class QGraphicsItem;
 
 HandCounter::HandCounter(QGraphicsItem *parent) : AbstractGraphicsItem(parent), number(0)
 {
diff --git a/cockatrice/src/game_graphics/hand_counter.h b/cockatrice/src/game_graphics/hand_counter.h
index c1f5d09d8..9aa65d514 100644
--- a/cockatrice/src/game_graphics/hand_counter.h
+++ b/cockatrice/src/game_graphics/hand_counter.h
@@ -10,10 +10,10 @@
 #include "board/abstract_graphics_item.h"
 #include "board/graphics_item_type.h"
 
-#include <qtmetamacros.h>
+#include <QString>
 
-class QGraphicsItem;
-class QPoint;
+class QPainter;
+class QPixmap;
 
 class HandCounter : public AbstractGraphicsItem
 {
diff --git a/cockatrice/src/game_graphics/log/message_log_widget.cpp b/cockatrice/src/game_graphics/log/message_log_widget.cpp
index 4a9750fca..b998a3650 100644
--- a/cockatrice/src/game_graphics/log/message_log_widget.cpp
+++ b/cockatrice/src/game_graphics/log/message_log_widget.cpp
@@ -3,39 +3,20 @@
 #include "../../client/settings/cache_settings.h"
 #include "../../client/settings/card_counter_settings.h"
 #include "../../client/sound_engine.h"
-#include "../../client/translation.h"
-#include "../../game/abstract_game.h"
-#include "../../game/board/card_list.h"
 #include "../../game/game_state.h"
 #include "../../game/phase.h"
-#include "../../game/player/player_event_handler.h"
-#include "../../game/player/player_info.h"
 #include "../../game/player/player_logic.h"
-#include "../../game/player/player_manager.h"
-#include "../../game/zones/card_zone_logic.h"
 #include "../../interface/card_localization.h"
-#include "../../interface/widgets/server/chat_view/chat_view.h"
+#include "../../interface/widgets/tabs/tab_game.h"
 #include "../board/card_item.h"
 #include "../board/translate_counter_name.h"
-#include "libcockatrice/protocol/pb/game_event_context.pb.h"
 
-#include <QColor>
-#include <QDebug>
-#include <QList>
-#include <QSharedPointer>
-#include <QStringList>
 #include <libcockatrice/protocol/pb/context_move_card.pb.h>
 #include <libcockatrice/protocol/pb/context_mulligan.pb.h>
 #include <libcockatrice/settings/chat_settings.h>
 #include <libcockatrice/utility/zone_names.h>
-#include <optional>
-#include <stdlib.h>
 #include <utility>
 
-class QWidget;
-class ServerInfo_User;
-class TabSupervisor;
-
 static QString sanitizeHtml(QString dirty)
 {
     return dirty.replace("&", "&amp;").replace("<", "&lt;").replace(">", "&gt;").replace("\"", "&quot;");
diff --git a/cockatrice/src/game_graphics/log/message_log_widget.h b/cockatrice/src/game_graphics/log/message_log_widget.h
index 6800ba8ed..375c6df4d 100644
--- a/cockatrice/src/game_graphics/log/message_log_widget.h
+++ b/cockatrice/src/game_graphics/log/message_log_widget.h
@@ -7,23 +7,14 @@
 #ifndef MESSAGELOGWIDGET_H
 #define MESSAGELOGWIDGET_H
 
+#include "../../game/zones/card_zone_logic.h"
 #include "../../interface/widgets/server/chat_view/chat_view.h"
 
-#include <QPair>
-#include <QString>
-#include <qtmetamacros.h>
-#include <sys/types.h>
-
 class AbstractGame;
 class CardItem;
 class GameEventContext;
 class PlayerLogic;
 class PlayerEventHandler;
-class CardZoneLogic;
-class QWidget;
-class ServerInfo_User;
-class TabSupervisor;
-template <typename T> class QList;
 
 class MessageLogWidget : public ChatView
 {
diff --git a/cockatrice/src/game_graphics/phases_toolbar.cpp b/cockatrice/src/game_graphics/phases_toolbar.cpp
index d0a3f74fd..3361f9d55 100644
--- a/cockatrice/src/game_graphics/phases_toolbar.cpp
+++ b/cockatrice/src/game_graphics/phases_toolbar.cpp
@@ -1,26 +1,17 @@
 #include "phases_toolbar.h"
 
 #include "../interface/pixel_map_generator.h"
-#include "board/abstract_graphics_item.h"
-#include "libcockatrice/protocol/pb/card_attributes.pb.h"
 
 #include <QAction>
-#include <QColor>
+#include <QDebug>
 #include <QPainter>
-#include <QPixmap>
-#include <QRect>
-#include <QRectF>
+#include <QPen>
 #include <QTimer>
-#include <QTransform>
-#include <QtGlobal>
-#include <google/protobuf/stubs/port.h>
 #include <libcockatrice/protocol/pb/command_draw_cards.pb.h>
 #include <libcockatrice/protocol/pb/command_next_turn.pb.h>
 #include <libcockatrice/protocol/pb/command_set_active_phase.pb.h>
 #include <libcockatrice/protocol/pb/command_set_card_attr.pb.h>
 #include <libcockatrice/utility/zone_names.h>
-#include <qnamespace.h>
-#include <qnumeric.h>
 
 PhaseButton::PhaseButton(const QString &_name, QGraphicsItem *parent, QAction *_doubleClickAction, bool _highlightable)
     : QObject(), QGraphicsItem(parent), name(_name), active(false), highlightable(_highlightable),
diff --git a/cockatrice/src/game_graphics/phases_toolbar.h b/cockatrice/src/game_graphics/phases_toolbar.h
index 376775284..39884ef75 100644
--- a/cockatrice/src/game_graphics/phases_toolbar.h
+++ b/cockatrice/src/game_graphics/phases_toolbar.h
@@ -8,14 +8,11 @@
 #ifndef PHASESTOOLBAR_H
 #define PHASESTOOLBAR_H
 
-#include <QGraphicsItem>
-#include <QList>
-#include <QObject>
-#include <QString>
-#include <qtmetamacros.h>
+#include "board/abstract_graphics_item.h"
 
-class QAction;
-class QTimer;
+#include <QFrame>
+#include <QGraphicsObject>
+#include <QList>
 
 namespace google
 {
@@ -24,6 +21,8 @@ namespace protobuf
 class Message;
 }
 } // namespace google
+class PlayerLogic;
+class GameCommand;
 
 class PhaseButton : public QObject, public QGraphicsItem
 {
diff --git a/cockatrice/src/game_graphics/player/menu/card_menu.cpp b/cockatrice/src/game_graphics/player/menu/card_menu.cpp
index 137ec2ed1..75ca1b28b 100644
--- a/cockatrice/src/game_graphics/player/menu/card_menu.cpp
+++ b/cockatrice/src/game_graphics/player/menu/card_menu.cpp
@@ -1,43 +1,21 @@
 #include "card_menu.h"
 
-#include "../../../client/settings/cache_settings.h"
 #include "../../../client/settings/card_counter_settings.h"
 #include "../../../client/settings/shortcuts_settings.h"
-#include "../../../game/abstract_game.h"
-#include "../../../game/player/player_info.h"
-#include "../../../game/player/player_manager.h"
-#include "../../../game/zones/card_zone_logic.h"
+#include "../../../interface/widgets/tabs/tab_game.h"
 #include "../../board/card_item.h"
 #include "../../game/player/player_actions.h"
 #include "../../game/player/player_logic.h"
 #include "../../game/zones/view_zone_logic.h"
-#include "../../game_scene.h"
 #include "../card_menu_action_type.h"
 #include "../player_graphics_item.h"
-#include "libcockatrice/card/card_info.h"
-#include "libcockatrice/card/database/card_database_querier.h"
-#include "libcockatrice/card/printing/exact_card.h"
-#include "libcockatrice/card/printing/printing_info.h"
-#include "libcockatrice/utility/card_ref.h"
 #include "move_menu.h"
 #include "pt_menu.h"
 
-#include <QAction>
-#include <QColor>
-#include <QIcon>
-#include <QMap>
-#include <QObject>
 #include <QPainter>
-#include <QPixmap>
-#include <QSharedPointer>
-#include <QStringList>
-#include <QVariant>
-#include <QtGlobal>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/card/relation/card_relation.h>
 #include <libcockatrice/utility/zone_names.h>
-#include <qnamespace.h>
-#include <utility>
 
 /**
  * @brief Creates a circular icon filled with the specified color.
diff --git a/cockatrice/src/game_graphics/player/menu/card_menu.h b/cockatrice/src/game_graphics/player/menu/card_menu.h
index 337d77b3e..d67ef3876 100644
--- a/cockatrice/src/game_graphics/player/menu/card_menu.h
+++ b/cockatrice/src/game_graphics/player/menu/card_menu.h
@@ -7,18 +7,12 @@
 #ifndef COCKATRICE_CARD_MENU_H
 #define COCKATRICE_CARD_MENU_H
 
-#include <QList>
 #include <QMenu>
-#include <QPair>
-#include <QString>
-#include <qtmetamacros.h>
+#include <libcockatrice/utility/card_ref.h>
 
 class CardItem;
 class PlayerGraphicsItem;
 class PlayerLogic;
-class QAction;
-struct CardRef;
-
 class CardMenu : public QMenu
 {
     Q_OBJECT
diff --git a/cockatrice/src/game_graphics/player/menu/custom_zone_menu.cpp b/cockatrice/src/game_graphics/player/menu/custom_zone_menu.cpp
index e16ebc112..743746cc8 100644
--- a/cockatrice/src/game_graphics/player/menu/custom_zone_menu.cpp
+++ b/cockatrice/src/game_graphics/player/menu/custom_zone_menu.cpp
@@ -1,14 +1,8 @@
 #include "custom_zone_menu.h"
 
-#include "../../../game/player/player_info.h"
 #include "../../game/player/player_logic.h"
-#include "../../game_scene.h"
 #include "../player_graphics_item.h"
 
-#include <QAction>
-#include <QList>
-#include <QVariant>
-
 CustomZoneMenu::CustomZoneMenu(PlayerGraphicsItem *_player) : player(_player)
 {
     menuAction()->setVisible(false);
diff --git a/cockatrice/src/game_graphics/player/menu/custom_zone_menu.h b/cockatrice/src/game_graphics/player/menu/custom_zone_menu.h
index 07f5510ca..46dd58db6 100644
--- a/cockatrice/src/game_graphics/player/menu/custom_zone_menu.h
+++ b/cockatrice/src/game_graphics/player/menu/custom_zone_menu.h
@@ -10,11 +10,8 @@
 #include "abstract_player_component.h"
 
 #include <QMenu>
-#include <QString>
-#include <qtmetamacros.h>
 
 class PlayerGraphicsItem;
-
 class CustomZoneMenu : public QMenu, public AbstractPlayerComponent
 {
     Q_OBJECT
diff --git a/cockatrice/src/game_graphics/player/menu/grave_menu.cpp b/cockatrice/src/game_graphics/player/menu/grave_menu.cpp
index 580d2642e..6d9364579 100644
--- a/cockatrice/src/game_graphics/player/menu/grave_menu.cpp
+++ b/cockatrice/src/game_graphics/player/menu/grave_menu.cpp
@@ -1,28 +1,15 @@
 #include "grave_menu.h"
 
-#include "../../../client/settings/cache_settings.h"
 #include "../../../client/settings/shortcuts_settings.h"
-#include "../../../game/player/player_info.h"
-#include "../../../game/player/player_manager.h"
-#include "../../../game/zones/pile_zone_logic.h"
-#include "../../../interface/widgets/menus/tearoff_menu.h"
 #include "../../game/abstract_game.h"
 #include "../../game/player/player_actions.h"
 #include "../../game/player/player_logic.h"
 #include "../player_graphics_item.h"
 
 #include <QAction>
-#include <QKeySequence>
-#include <QList>
-#include <QMap>
 #include <QMenu>
-#include <QObject>
-#include <QString>
-#include <QVariant>
 #include <libcockatrice/utility/zone_names.h>
 
-class QWidget;
-
 GraveyardMenu::GraveyardMenu(PlayerGraphicsItem *_player, QWidget *parent) : TearOffMenu(parent), player(_player)
 {
     createMoveActions();
diff --git a/cockatrice/src/game_graphics/player/menu/grave_menu.h b/cockatrice/src/game_graphics/player/menu/grave_menu.h
index fa285409f..116261e9b 100644
--- a/cockatrice/src/game_graphics/player/menu/grave_menu.h
+++ b/cockatrice/src/game_graphics/player/menu/grave_menu.h
@@ -10,13 +10,10 @@
 #include "../../../interface/widgets/menus/tearoff_menu.h"
 #include "abstract_player_component.h"
 
-#include <qtmetamacros.h>
+#include <QAction>
+#include <QMenu>
 
 class PlayerGraphicsItem;
-class QAction;
-class QMenu;
-class QWidget;
-
 class GraveyardMenu : public TearOffMenu, public AbstractPlayerComponent
 {
     Q_OBJECT
diff --git a/cockatrice/src/game_graphics/player/menu/hand_menu.cpp b/cockatrice/src/game_graphics/player/menu/hand_menu.cpp
index 141542cb4..ba0702f07 100644
--- a/cockatrice/src/game_graphics/player/menu/hand_menu.cpp
+++ b/cockatrice/src/game_graphics/player/menu/hand_menu.cpp
@@ -2,28 +2,16 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../../client/settings/shortcuts_settings.h"
-#include "../../../game/board/card_list.h"
-#include "../../../game/player/player_info.h"
-#include "../../../game/player/player_manager.h"
-#include "../../../game/zones/hand_zone_logic.h"
-#include "../../../interface/widgets/menus/tearoff_menu.h"
+#include "../../../game_graphics/zones/hand_zone.h"
 #include "../../game/abstract_game.h"
 #include "../../game/player/player_actions.h"
 #include "../../game/player/player_logic.h"
 #include "../player_graphics_item.h"
 
 #include <QAction>
-#include <QKeySequence>
-#include <QList>
-#include <QMap>
 #include <QMenu>
-#include <QObject>
-#include <QString>
-#include <QVariant>
 #include <libcockatrice/utility/zone_names.h>
 
-class QWidget;
-
 HandMenu::HandMenu(PlayerGraphicsItem *_player, QWidget *parent) : TearOffMenu(parent), player(_player)
 {
     auto *actions = player->getLogic()->getPlayerActions();
diff --git a/cockatrice/src/game_graphics/player/menu/hand_menu.h b/cockatrice/src/game_graphics/player/menu/hand_menu.h
index de7726064..d5204612b 100644
--- a/cockatrice/src/game_graphics/player/menu/hand_menu.h
+++ b/cockatrice/src/game_graphics/player/menu/hand_menu.h
@@ -10,12 +10,11 @@
 #include "../../../interface/widgets/menus/tearoff_menu.h"
 #include "abstract_player_component.h"
 
-#include <qtmetamacros.h>
+#include <QAction>
+#include <QMenu>
 
 class PlayerGraphicsItem;
-class QAction;
-class QMenu;
-class QWidget;
+class PlayerActions;
 
 class HandMenu : public TearOffMenu, public AbstractPlayerComponent
 {
diff --git a/cockatrice/src/game_graphics/player/menu/library_menu.cpp b/cockatrice/src/game_graphics/player/menu/library_menu.cpp
index aa389006e..4c15e09ec 100644
--- a/cockatrice/src/game_graphics/player/menu/library_menu.cpp
+++ b/cockatrice/src/game_graphics/player/menu/library_menu.cpp
@@ -2,29 +2,15 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../../client/settings/shortcuts_settings.h"
-#include "../../../game/board/card_list.h"
-#include "../../../game/player/player_info.h"
-#include "../../../game/player/player_manager.h"
-#include "../../../game/zones/pile_zone_logic.h"
-#include "../../../interface/widgets/menus/tearoff_menu.h"
+#include "../../../interface/widgets/tabs/tab_game.h"
 #include "../../game/abstract_game.h"
 #include "../../game/player/player_actions.h"
 #include "../../game/player/player_logic.h"
 #include "../player_graphics_item.h"
 
 #include <QAction>
-#include <QGraphicsScene>
 #include <QGraphicsView>
-#include <QInputDialog>
-#include <QKeySequence>
-#include <QList>
-#include <QMap>
 #include <QMenu>
-#include <QObject>
-#include <QString>
-#include <QVariant>
-
-class QWidget;
 
 LibraryMenu::LibraryMenu(PlayerGraphicsItem *_player, QWidget *parent) : TearOffMenu(parent), player(_player)
 {
diff --git a/cockatrice/src/game_graphics/player/menu/library_menu.h b/cockatrice/src/game_graphics/player/menu/library_menu.h
index 72e90d0ba..bc0e6fb8e 100644
--- a/cockatrice/src/game_graphics/player/menu/library_menu.h
+++ b/cockatrice/src/game_graphics/player/menu/library_menu.h
@@ -11,11 +11,11 @@
 #include "abstract_player_component.h"
 
 #include <QAction>
-#include <qtmetamacros.h>
+#include <QMenu>
 
 class PlayerGraphicsItem;
-class QMenu;
-class QWidget;
+class PlayerLogic;
+class PlayerActions;
 
 class LibraryMenu : public TearOffMenu, public AbstractPlayerComponent
 {
diff --git a/cockatrice/src/game_graphics/player/menu/move_menu.cpp b/cockatrice/src/game_graphics/player/menu/move_menu.cpp
index 2991100ec..632e0ddda 100644
--- a/cockatrice/src/game_graphics/player/menu/move_menu.cpp
+++ b/cockatrice/src/game_graphics/player/menu/move_menu.cpp
@@ -1,15 +1,11 @@
 #include "move_menu.h"
 
-#include "../../../client/settings/cache_settings.h"
 #include "../../../client/settings/shortcuts_settings.h"
 #include "../../game/player/player_actions.h"
 #include "../../game/player/player_logic.h"
-#include "../../game_scene.h"
 #include "../card_menu_action_type.h"
 #include "../player_graphics_item.h"
 
-#include <QAction>
-
 MoveMenu::MoveMenu(PlayerGraphicsItem *player) : QMenu(tr("Move to"))
 {
     aMoveToTopLibrary = new QAction(this);
diff --git a/cockatrice/src/game_graphics/player/menu/move_menu.h b/cockatrice/src/game_graphics/player/menu/move_menu.h
index f1f239abd..150bdbd3c 100644
--- a/cockatrice/src/game_graphics/player/menu/move_menu.h
+++ b/cockatrice/src/game_graphics/player/menu/move_menu.h
@@ -7,11 +7,8 @@
 #ifndef COCKATRICE_MOVE_MENU_H
 #define COCKATRICE_MOVE_MENU_H
 #include <QMenu>
-#include <qtmetamacros.h>
 
 class PlayerGraphicsItem;
-class QAction;
-
 class MoveMenu : public QMenu
 {
     Q_OBJECT
diff --git a/cockatrice/src/game_graphics/player/menu/player_menu.cpp b/cockatrice/src/game_graphics/player/menu/player_menu.cpp
index 44b184cfe..7c90211df 100644
--- a/cockatrice/src/game_graphics/player/menu/player_menu.cpp
+++ b/cockatrice/src/game_graphics/player/menu/player_menu.cpp
@@ -1,31 +1,16 @@
 #include "player_menu.h"
 
-#include "../../../client/settings/cache_settings.h"
 #include "../../../client/settings/shortcuts_settings.h"
-#include "../../../game/abstract_game.h"
-#include "../../../game/player/player_info.h"
-#include "../../../game/player/player_logic.h"
-#include "../../../game/player/player_manager.h"
 #include "../../../game_graphics/zones/hand_zone.h"
 #include "../../../game_graphics/zones/pile_zone.h"
 #include "../../../game_graphics/zones/table_zone.h"
-#include "../../../interface/widgets/menus/tearoff_menu.h"
+#include "../../../interface/widgets/tabs/tab_game.h"
 #include "../../board/card_item.h"
 #include "../player_graphics_item.h"
-#include "abstract_player_component.h"
 #include "card_menu.h"
-#include "custom_zone_menu.h"
-#include "grave_menu.h"
 #include "hand_menu.h"
-#include "library_menu.h"
-#include "rfg_menu.h"
-#include "say_menu.h"
-#include "sideboard_menu.h"
-#include "tally_menu.h"
-#include "utility_menu.h"
 
-#include <QMenu>
-#include <QString>
+#include <libcockatrice/protocol/pb/command_reveal_cards.pb.h>
 
 PlayerMenu::PlayerMenu(PlayerGraphicsItem *_player) : QObject(_player), player(_player)
 {
diff --git a/cockatrice/src/game_graphics/player/menu/player_menu.h b/cockatrice/src/game_graphics/player/menu/player_menu.h
index 97dd2fc56..a6e89fab0 100644
--- a/cockatrice/src/game_graphics/player/menu/player_menu.h
+++ b/cockatrice/src/game_graphics/player/menu/player_menu.h
@@ -8,28 +8,24 @@
 #define COCKATRICE_PLAYER_MENU_H
 
 #include "../../../interface/widgets/menus/tearoff_menu.h"
+#include "custom_zone_menu.h"
+#include "grave_menu.h"
+#include "hand_menu.h"
+#include "library_menu.h"
+#include "rfg_menu.h"
+#include "say_menu.h"
+#include "sideboard_menu.h"
+#include "tally_menu.h"
+#include "utility_menu.h"
 
 #include <QList>
+#include <QMenu>
 #include <QObject>
-#include <qtmetamacros.h>
-#include <utility>
+#include <libcockatrice/utility/card_ref.h>
 
 class CardItem;
 class CardMenu;
 class PlayerGraphicsItem;
-class AbstractPlayerComponent;
-class CustomZoneMenu;
-class GraveyardMenu;
-class HandMenu;
-class LibraryMenu;
-class QMenu;
-class RfgMenu;
-class SayMenu;
-class SideboardMenu;
-class TallyMenu;
-class UtilityMenu;
-struct CardRef;
-
 class PlayerMenu : public QObject
 {
     Q_OBJECT
diff --git a/cockatrice/src/game_graphics/player/menu/pt_menu.cpp b/cockatrice/src/game_graphics/player/menu/pt_menu.cpp
index b4f852b43..152461c18 100644
--- a/cockatrice/src/game_graphics/player/menu/pt_menu.cpp
+++ b/cockatrice/src/game_graphics/player/menu/pt_menu.cpp
@@ -1,14 +1,10 @@
 #include "pt_menu.h"
 
-#include "../../../client/settings/cache_settings.h"
 #include "../../../client/settings/shortcuts_settings.h"
 #include "../../game/player/player_actions.h"
 #include "../../game/player/player_logic.h"
-#include "../../game_scene.h"
 #include "../player_graphics_item.h"
 
-#include <QAction>
-
 PtMenu::PtMenu(PlayerGraphicsItem *player) : QMenu(tr("Power / toughness"))
 {
     PlayerActions *playerActions = player->getLogic()->getPlayerActions();
diff --git a/cockatrice/src/game_graphics/player/menu/pt_menu.h b/cockatrice/src/game_graphics/player/menu/pt_menu.h
index aaf17cead..72f828801 100644
--- a/cockatrice/src/game_graphics/player/menu/pt_menu.h
+++ b/cockatrice/src/game_graphics/player/menu/pt_menu.h
@@ -7,11 +7,8 @@
 #ifndef COCKATRICE_PT_MENU_H
 #define COCKATRICE_PT_MENU_H
 #include <QMenu>
-#include <qtmetamacros.h>
 
 class PlayerGraphicsItem;
-class QAction;
-
 class PtMenu : public QMenu
 {
 
diff --git a/cockatrice/src/game_graphics/player/menu/rfg_menu.cpp b/cockatrice/src/game_graphics/player/menu/rfg_menu.cpp
index 98514280f..45abadbf7 100644
--- a/cockatrice/src/game_graphics/player/menu/rfg_menu.cpp
+++ b/cockatrice/src/game_graphics/player/menu/rfg_menu.cpp
@@ -1,21 +1,11 @@
 #include "rfg_menu.h"
 
-#include "../../../game/player/player_info.h"
-#include "../../../game/zones/pile_zone_logic.h"
-#include "../../../interface/widgets/menus/tearoff_menu.h"
 #include "../../game/player/player_actions.h"
 #include "../../game/player/player_logic.h"
 #include "../player_graphics_item.h"
 
-#include <QAction>
-#include <QList>
-#include <QMenu>
-#include <QString>
-#include <QVariant>
 #include <libcockatrice/utility/zone_names.h>
 
-class QWidget;
-
 RfgMenu::RfgMenu(PlayerGraphicsItem *_player, QWidget *parent) : TearOffMenu(parent), player(_player)
 {
     createMoveActions();
diff --git a/cockatrice/src/game_graphics/player/menu/rfg_menu.h b/cockatrice/src/game_graphics/player/menu/rfg_menu.h
index 8e1460316..f5dd888e4 100644
--- a/cockatrice/src/game_graphics/player/menu/rfg_menu.h
+++ b/cockatrice/src/game_graphics/player/menu/rfg_menu.h
@@ -10,13 +10,10 @@
 #include "../../../interface/widgets/menus/tearoff_menu.h"
 #include "abstract_player_component.h"
 
-#include <qtmetamacros.h>
+#include <QAction>
+#include <QMenu>
 
 class PlayerGraphicsItem;
-class QAction;
-class QMenu;
-class QWidget;
-
 class RfgMenu : public TearOffMenu, public AbstractPlayerComponent
 {
     Q_OBJECT
diff --git a/cockatrice/src/game_graphics/player/menu/say_menu.cpp b/cockatrice/src/game_graphics/player/menu/say_menu.cpp
index d467c6469..e7b0b3826 100644
--- a/cockatrice/src/game_graphics/player/menu/say_menu.cpp
+++ b/cockatrice/src/game_graphics/player/menu/say_menu.cpp
@@ -5,12 +5,7 @@
 #include "../../game/player/player_logic.h"
 #include "../player_graphics_item.h"
 
-#include <QAction>
-#include <QKeySequence>
-#include <QList>
-#include <QString>
 #include <libcockatrice/settings/message_settings.h>
-
 SayMenu::SayMenu(PlayerGraphicsItem *_player) : player(_player)
 {
     connect(&SettingsCache::instance().messages(), &MessageSettings::messageMacrosChanged, this, &SayMenu::initSayMenu);
diff --git a/cockatrice/src/game_graphics/player/menu/say_menu.h b/cockatrice/src/game_graphics/player/menu/say_menu.h
index 72169d18f..3ff160d05 100644
--- a/cockatrice/src/game_graphics/player/menu/say_menu.h
+++ b/cockatrice/src/game_graphics/player/menu/say_menu.h
@@ -10,10 +10,8 @@
 #include "abstract_player_component.h"
 
 #include <QMenu>
-#include <qtmetamacros.h>
 
 class PlayerGraphicsItem;
-
 class SayMenu : public QMenu, public AbstractPlayerComponent
 {
     Q_OBJECT
diff --git a/cockatrice/src/game_graphics/player/menu/sideboard_menu.cpp b/cockatrice/src/game_graphics/player/menu/sideboard_menu.cpp
index 1eef3604f..6753f743e 100644
--- a/cockatrice/src/game_graphics/player/menu/sideboard_menu.cpp
+++ b/cockatrice/src/game_graphics/player/menu/sideboard_menu.cpp
@@ -1,15 +1,10 @@
 #include "sideboard_menu.h"
 
-#include "../../../client/settings/cache_settings.h"
 #include "../../../client/settings/shortcuts_settings.h"
-#include "../../../game/player/player_info.h"
 #include "../../game/player/player_actions.h"
 #include "../../game/player/player_logic.h"
 #include "../player_graphics_item.h"
 
-#include <QAction>
-#include <QKeySequence>
-
 SideboardMenu::SideboardMenu(PlayerGraphicsItem *player, QMenu *playerMenu) : QMenu(playerMenu)
 {
     aViewSideboard = new QAction(this);
diff --git a/cockatrice/src/game_graphics/player/menu/sideboard_menu.h b/cockatrice/src/game_graphics/player/menu/sideboard_menu.h
index 3e6501c90..b3b547291 100644
--- a/cockatrice/src/game_graphics/player/menu/sideboard_menu.h
+++ b/cockatrice/src/game_graphics/player/menu/sideboard_menu.h
@@ -10,11 +10,8 @@
 #include "abstract_player_component.h"
 
 #include <QMenu>
-#include <qtmetamacros.h>
 
 class PlayerGraphicsItem;
-class QAction;
-
 class SideboardMenu : public QMenu, public AbstractPlayerComponent
 {
     Q_OBJECT
diff --git a/cockatrice/src/game_graphics/player/menu/tally_menu.cpp b/cockatrice/src/game_graphics/player/menu/tally_menu.cpp
index 7ae5b36ce..08cb6cac9 100644
--- a/cockatrice/src/game_graphics/player/menu/tally_menu.cpp
+++ b/cockatrice/src/game_graphics/player/menu/tally_menu.cpp
@@ -1,10 +1,7 @@
 #include "tally_menu.h"
 
 #include "../../../client/settings/cache_settings.h"
-#include "../../tally/tally.h"
-#include "libcockatrice/settings/interface_settings.h"
 
-#include <QAction>
 #include <QActionGroup>
 
 TallyMenu::TallyMenu()
diff --git a/cockatrice/src/game_graphics/player/menu/tally_menu.h b/cockatrice/src/game_graphics/player/menu/tally_menu.h
index 75bd41ac0..11802fd20 100644
--- a/cockatrice/src/game_graphics/player/menu/tally_menu.h
+++ b/cockatrice/src/game_graphics/player/menu/tally_menu.h
@@ -2,13 +2,10 @@
 #define COCKATRICE_TALLY_MENU_H
 
 #include "../../../interface/widgets/menus/tearoff_menu.h"
+#include "../../tally/tally.h"
 #include "abstract_player_component.h"
 
-#include <qtmetamacros.h>
-
-class QAction;
-class QActionGroup;
-enum class TallyType;
+#include <QMenu>
 
 class TallyMenu : public TearOffMenu, public AbstractPlayerComponent
 {
diff --git a/cockatrice/src/game_graphics/player/menu/utility_menu.cpp b/cockatrice/src/game_graphics/player/menu/utility_menu.cpp
index 7c18b3f4c..a7ea38d9a 100644
--- a/cockatrice/src/game_graphics/player/menu/utility_menu.cpp
+++ b/cockatrice/src/game_graphics/player/menu/utility_menu.cpp
@@ -1,17 +1,12 @@
 #include "utility_menu.h"
 
-#include "../../../client/settings/cache_settings.h"
 #include "../../../client/settings/shortcuts_settings.h"
-#include "../../../game/player/player_info.h"
+#include "../../../interface/deck_loader/deck_loader.h"
 #include "../../game/player/player_actions.h"
 #include "../../game/player/player_logic.h"
-#include "../../game_scene.h"
 #include "../player_graphics_item.h"
-#include "libcockatrice/card/card_info.h"
-#include "libcockatrice/deck_list/deck_list.h"
+#include "player_menu.h"
 
-#include <QKeySequence>
-#include <QSet>
 #include <libcockatrice/deck_list/tree/deck_list_card_node.h>
 #include <libcockatrice/deck_list/tree/inner_deck_list_node.h>
 
diff --git a/cockatrice/src/game_graphics/player/menu/utility_menu.h b/cockatrice/src/game_graphics/player/menu/utility_menu.h
index 009e4aca3..bdc2a81a5 100644
--- a/cockatrice/src/game_graphics/player/menu/utility_menu.h
+++ b/cockatrice/src/game_graphics/player/menu/utility_menu.h
@@ -9,16 +9,10 @@
 
 #include "abstract_player_component.h"
 
-#include <QAction>
-#include <QList>
 #include <QMenu>
-#include <QString>
-#include <QStringList>
 #include <libcockatrice/card/card_info.h>
-#include <qtmetamacros.h>
 
 class PlayerGraphicsItem;
-
 class UtilityMenu : public QMenu, public AbstractPlayerComponent
 {
     Q_OBJECT
diff --git a/cockatrice/src/game_graphics/player/player_area.cpp b/cockatrice/src/game_graphics/player/player_area.cpp
index 2af642eb5..86b8c2d1b 100644
--- a/cockatrice/src/game_graphics/player/player_area.cpp
+++ b/cockatrice/src/game_graphics/player/player_area.cpp
@@ -2,7 +2,6 @@
 
 #include "../../interface/theme_manager.h"
 
-#include <QBrush>
 #include <QPainter>
 
 PlayerArea::PlayerArea(QGraphicsItem *parentItem) : QObject(), QGraphicsItem(parentItem)
diff --git a/cockatrice/src/game_graphics/player/player_area.h b/cockatrice/src/game_graphics/player/player_area.h
index 7370a78be..d73547f81 100644
--- a/cockatrice/src/game_graphics/player/player_area.h
+++ b/cockatrice/src/game_graphics/player/player_area.h
@@ -8,14 +8,7 @@
 #define COCKATRICE_PLAYER_AREA_H
 
 #include "../board/graphics_item_type.h"
-
-#include <QGraphicsItem>
-#include <QObject>
-#include <QRectF>
-#include <QtGlobal>
-#include <qtmetamacros.h>
-
-class QGraphicsItem;
+#include "QGraphicsItem"
 
 /**
  * The entire graphical area belonging to a single player.
diff --git a/cockatrice/src/game_graphics/player/player_dialogs.cpp b/cockatrice/src/game_graphics/player/player_dialogs.cpp
index 74f5de601..95c225812 100644
--- a/cockatrice/src/game_graphics/player/player_dialogs.cpp
+++ b/cockatrice/src/game_graphics/player/player_dialogs.cpp
@@ -1,21 +1,12 @@
 #include "player_dialogs.h"
 
-#include "../../client/settings/cache_settings.h"
 #include "../../client/settings/card_counter_settings.h"
-#include "../../game/player/player_actions.h"
-#include "../../game/player/player_logic.h"
 #include "../../interface/widgets/utility/get_text_with_max.h"
-#include "../board/abstract_counter.h"
 #include "../board/card_item.h"
-#include "../dialogs/dlg_create_token.h"
-#include "../dialogs/dlg_move_top_cards_until.h"
 #include "../dialogs/dlg_roll_dice.h"
-#include "../game_scene.h"
 #include "../player/player_graphics_item.h"
 
-#include <QChar>
 #include <QInputDialog>
-#include <QLineEdit>
 #include <libcockatrice/card/relation/card_relation.h>
 #include <libcockatrice/utility/string_limits.h>
 
diff --git a/cockatrice/src/game_graphics/player/player_dialogs.h b/cockatrice/src/game_graphics/player/player_dialogs.h
index 86d7282a2..f87704f2d 100644
--- a/cockatrice/src/game_graphics/player/player_dialogs.h
+++ b/cockatrice/src/game_graphics/player/player_dialogs.h
@@ -1,26 +1,12 @@
 #ifndef COCKATRICE_PLAYER_DIALOGS_H
 #define COCKATRICE_PLAYER_DIALOGS_H
+#include "../../game/player/player_actions.h"
 #include "player_graphics_item.h"
 
-// IWYU pragma: keep
-// MoveTopCardsUntilOptions is passed by value to a slot, so the moc-generated
-// code needs the complete type.
-#include "../dialogs/dlg_move_top_cards_until.h"
-
-#include <QGraphicsScene>
 #include <QGraphicsView>
-#include <QList>
 #include <QObject>
-#include <QString>
-#include <QStringList>
-#include <qtmetamacros.h>
-
-class CardItem;
-class CardRelation;
-class PlayerActions;
-class QWidget;
-struct MoveTopCardsUntilOptions;
 
+class PlayerGraphicsItem;
 class PlayerDialogs : public QObject
 {
 
diff --git a/cockatrice/src/game_graphics/player/player_graphics_item.cpp b/cockatrice/src/game_graphics/player/player_graphics_item.cpp
index 419816087..122ab83be 100644
--- a/cockatrice/src/game_graphics/player/player_graphics_item.cpp
+++ b/cockatrice/src/game_graphics/player/player_graphics_item.cpp
@@ -1,53 +1,26 @@
 #include "player_graphics_item.h"
 
-#include "../../client/settings/cache_settings.h"
-#include "../../game/board/counter_state.h"
 #include "../../game/player/player_actions.h"
-#include "../../game/player/player_info.h"
-#include "../../game/player/player_logic.h"
-#include "../../game/zones/card_zone_logic.h"
-#include "../../game/zones/hand_zone_logic.h"
-#include "../../game/zones/pile_zone_logic.h"
-#include "../../game/zones/stack_zone_logic.h"
-#include "../../game/zones/table_zone_logic.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 "../board/abstract_counter.h"
+#include "../../interface/widgets/tabs/tab_game.h"
+#include "../board/abstract_card_item.h"
 #include "../board/counter_general.h"
-#include "../card_dimensions.h"
 #include "../hand_counter.h"
 #include "../zones/hand_zone.h"
 #include "../zones/pile_zone.h"
 #include "../zones/stack_zone.h"
 #include "../zones/table_zone.h"
-#include "libcockatrice/card/card_info.h"
-#include "libcockatrice/card/database/card_database_querier.h"
-#include "libcockatrice/card/printing/exact_card.h"
-#include "libcockatrice/interfaces/interface_interface_settings_provider.h"
-#include "libcockatrice/utility/card_ref.h"
 #include "menu/player_menu.h"
-#include "player_area.h"
 #include "player_dialogs.h"
-#include "player_target.h"
 
-#include <QList>
-#include <QMapIterator>
-#include <QMenu>
-#include <QPainter>
-#include <QPoint>
-#include <QPointF>
-#include <QRect>
-#include <QSharedPointer>
-#include <QTransform>
-#include <QtGlobal>
+#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>
-#include <qnamespace.h>
-#include <qnumeric.h>
 
 PlayerGraphicsItem::PlayerGraphicsItem(PlayerLogic *_player) : player(_player)
 {
diff --git a/cockatrice/src/game_graphics/player/player_graphics_item.h b/cockatrice/src/game_graphics/player/player_graphics_item.h
index e1ca0a036..e5ae59a61 100644
--- a/cockatrice/src/game_graphics/player/player_graphics_item.h
+++ b/cockatrice/src/game_graphics/player/player_graphics_item.h
@@ -6,20 +6,12 @@
 
 #ifndef COCKATRICE_PLAYER_GRAPHICS_ITEM_H
 #define COCKATRICE_PLAYER_GRAPHICS_ITEM_H
-#include "../board/graphics_item_type.h"
+#include "../../game/player/player_logic.h"
+#include "../board/abstract_counter.h"
 #include "../game_scene.h"
-#include "libcockatrice/utility/playmat_params.h"
 
 #include <QGraphicsObject>
-#include <QMap>
-#include <QMetaObject>
-#include <QPixmap>
-#include <QRectF>
-#include <QSize>
-#include <QSizeF>
-#include <QString>
-#include <QtGlobal>
-#include <qtmetamacros.h>
+#include <libcockatrice/deck_list/deck_list.h>
 
 class HandZone;
 class PileZone;
@@ -28,12 +20,7 @@ class PlayerMenu;
 class PlayerTarget;
 class StackZone;
 class TableZone;
-class AbstractCounter;
-class CardZone;
-class CounterState;
-class PlayerArea;
-class PlayerLogic;
-struct CardRef;
+class ZoneViewZone;
 
 class PlayerGraphicsItem : public QGraphicsObject
 {
diff --git a/cockatrice/src/game_graphics/player/player_list_widget.cpp b/cockatrice/src/game_graphics/player/player_list_widget.cpp
index 7b358010f..a7ec2e4a9 100644
--- a/cockatrice/src/game_graphics/player/player_list_widget.cpp
+++ b/cockatrice/src/game_graphics/player/player_list_widget.cpp
@@ -2,30 +2,16 @@
 
 #include "../../interface/pixel_map_generator.h"
 #include "../../interface/widgets/server/user/user_context_menu.h"
-#include "libcockatrice/protocol/pb/serverinfo_user.pb.h"
-#include "user_level.h"
+#include "../../interface/widgets/server/user/user_list_manager.h"
+#include "../../interface/widgets/server/user/user_list_widget.h"
+#include "../../interface/widgets/tabs/tab_game.h"
+#include "../../interface/widgets/tabs/tab_supervisor.h"
 
-#include <QBrush>
-#include <QColor>
-#include <QEvent>
-#include <QFlag>
-#include <QList>
-#include <QMapIterator>
-#include <QModelIndex>
+#include <QHeaderView>
 #include <QMouseEvent>
-#include <QPalette>
-#include <QPointF>
-#include <QSharedPointer>
-#include <QSize>
-#include <QStringLiteral>
-#include <QVariant>
+#include <libcockatrice/protocol/pb/command_kick_from_game.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_playerproperties.pb.h>
-#include <qnamespace.h>
-
-class QModelIndex;
-class QObject;
-class QPoint;
-class QWidget;
+#include <libcockatrice/protocol/pb/session_commands.pb.h>
 
 PlayerListItemDelegate::PlayerListItemDelegate(QObject *const parent) : QStyledItemDelegate(parent)
 {
diff --git a/cockatrice/src/game_graphics/player/player_list_widget.h b/cockatrice/src/game_graphics/player/player_list_widget.h
index b070fe312..f2f0be5fd 100644
--- a/cockatrice/src/game_graphics/player/player_list_widget.h
+++ b/cockatrice/src/game_graphics/player/player_list_widget.h
@@ -7,23 +7,18 @@
 #ifndef PLAYERLISTWIDGET_H
 #define PLAYERLISTWIDGET_H
 
+#include "../../game/player/player_logic.h"
+
 #include <QIcon>
 #include <QMap>
-#include <QString>
 #include <QStyledItemDelegate>
 #include <QTreeWidget>
-#include <QTreeWidgetItem>
-#include <qtmetamacros.h>
 
 class ServerInfo_PlayerProperties;
 class TabSupervisor;
 class AbstractClient;
 class AbstractGame;
 class UserContextMenu;
-class QModelIndex;
-class QObject;
-class QPoint;
-class QWidget;
 
 class PlayerListItemDelegate : public QStyledItemDelegate
 {
diff --git a/cockatrice/src/game_graphics/player/player_target.cpp b/cockatrice/src/game_graphics/player/player_target.cpp
index 24734cd42..d6c28370d 100644
--- a/cockatrice/src/game_graphics/player/player_target.cpp
+++ b/cockatrice/src/game_graphics/player/player_target.cpp
@@ -1,43 +1,16 @@
 #include "player_target.h"
 
 #include "../../client/settings/cache_settings.h"
-#include "../../game/player/player_info.h"
 #include "../../game/player/player_logic.h"
 #include "../../interface/pixel_map_generator.h"
-#include "../board/abstract_counter.h"
-#include "../board/abstract_graphics_item.h"
-#include "../board/arrow_target.h"
 #include "../game_scene.h"
-#include "libcockatrice/settings/interface_settings.h"
-#include "user_level.h"
 
-#include <QBrush>
-#include <QColor>
-#include <QFlag>
-#include <QFlags>
-#include <QFont>
-#include <QObject>
+#include <QApplication>
+#include <QDebug>
 #include <QPainter>
-#include <QPainterPath>
-#include <QPen>
 #include <QPixmapCache>
-#include <QPointF>
-#include <QRadialGradient>
-#include <QRectF>
-#include <QSize>
-#include <QSizeF>
-#include <QString>
-#include <QTransform>
-#include <QtGlobal>
 #include <QtMath>
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
-#include <qnamespace.h>
-#include <qnumeric.h>
-#include <string>
-#include <sys/types.h>
-
-class CounterState;
-class QGraphicsItem;
 
 PlayerCounter::PlayerCounter(CounterState *state, PlayerLogic *player, QGraphicsItem *parent)
     : AbstractCounter(state, player, false, false, parent)
diff --git a/cockatrice/src/game_graphics/player/player_target.h b/cockatrice/src/game_graphics/player/player_target.h
index 7780104d2..1d06c6274 100644
--- a/cockatrice/src/game_graphics/player/player_target.h
+++ b/cockatrice/src/game_graphics/player/player_target.h
@@ -14,12 +14,8 @@
 
 #include <QElapsedTimer>
 #include <QPixmap>
-#include <QtGlobal>
-#include <qtmetamacros.h>
 
 class PlayerLogic;
-class CounterState;
-class QGraphicsItem;
 
 class PlayerCounter : public AbstractCounter, public IAnimatedItem
 {
diff --git a/cockatrice/src/game_graphics/tally/stats_tally.cpp b/cockatrice/src/game_graphics/tally/stats_tally.cpp
index 28e280c02..7e05c3fb1 100644
--- a/cockatrice/src/game_graphics/tally/stats_tally.cpp
+++ b/cockatrice/src/game_graphics/tally/stats_tally.cpp
@@ -4,11 +4,6 @@
 
 #include <QCoreApplication>
 #include <QList>
-#include <QSharedPointer>
-#include <QString>
-#include <QVariant>
-#include <QVariantList>
-#include <QtGlobal>
 #include <algorithm>
 
 static int sumPowers(const QList<CardItem *> &cards)
diff --git a/cockatrice/src/game_graphics/tally/stats_tally.h b/cockatrice/src/game_graphics/tally/stats_tally.h
index cb0bdf81b..e499587eb 100644
--- a/cockatrice/src/game_graphics/tally/stats_tally.h
+++ b/cockatrice/src/game_graphics/tally/stats_tally.h
@@ -2,10 +2,6 @@
 #define COCKATRICE_STATS_TALLY_H
 #include "tally.h"
 
-#include <QList>
-
-class CardItem;
-
 /**
  * @brief Extracts and tallies stats from selected cards.
  */
diff --git a/cockatrice/src/game_graphics/tally/subtype_tally.cpp b/cockatrice/src/game_graphics/tally/subtype_tally.cpp
index ccd727405..2241eb3b2 100644
--- a/cockatrice/src/game_graphics/tally/subtype_tally.cpp
+++ b/cockatrice/src/game_graphics/tally/subtype_tally.cpp
@@ -1,18 +1,9 @@
 #include "subtype_tally.h"
 
 #include "../board/card_item.h"
-#include "libcockatrice/card/card_info.h"
-#include "libcockatrice/card/printing/exact_card.h"
 
 #include <QMap>
-#include <QSharedPointer>
-#include <QString>
-#include <QStringList>
-#include <QStringLiteral>
 #include <algorithm>
-#include <compare>
-#include <iterator>
-#include <qnamespace.h>
 
 namespace
 {
diff --git a/cockatrice/src/game_graphics/tally/subtype_tally.h b/cockatrice/src/game_graphics/tally/subtype_tally.h
index 019a797d4..9926528e0 100644
--- a/cockatrice/src/game_graphics/tally/subtype_tally.h
+++ b/cockatrice/src/game_graphics/tally/subtype_tally.h
@@ -4,6 +4,7 @@
 #include "tally.h"
 
 #include <QList>
+#include <QString>
 
 class CardItem;
 
diff --git a/cockatrice/src/game_graphics/tally/tally.h b/cockatrice/src/game_graphics/tally/tally.h
index 5699758e7..84c54918f 100644
--- a/cockatrice/src/game_graphics/tally/tally.h
+++ b/cockatrice/src/game_graphics/tally/tally.h
@@ -1,6 +1,5 @@
 #ifndef COCKATRICE_TALLY_H
 #define COCKATRICE_TALLY_H
-#include <QList>
 #include <QString>
 
 class CardItem;
diff --git a/cockatrice/src/game_graphics/zones/card_zone.cpp b/cockatrice/src/game_graphics/zones/card_zone.cpp
index d09bb588c..3457b681e 100644
--- a/cockatrice/src/game_graphics/zones/card_zone.cpp
+++ b/cockatrice/src/game_graphics/zones/card_zone.cpp
@@ -1,18 +1,10 @@
 #include "card_zone.h"
 
-#include "../../game/board/card_list.h"
-#include "../../game/zones/card_zone_logic.h"
-#include "../board/abstract_graphics_item.h"
 #include "../board/card_item.h"
+#include "view_zone.h"
 
-#include <QAction>
 #include <QGraphicsSceneMouseEvent>
 #include <QMenu>
-#include <qnamespace.h>
-
-class QGraphicsItem;
-class QPoint;
-class QPointF;
 
 CardZone::CardZone(CardZoneLogic *_logic, QGraphicsItem *parent)
     : AbstractGraphicsItem(parent), menu(nullptr), doubleClickAction(0), logic(_logic)
@@ -48,7 +40,7 @@ void CardZone::mouseDoubleClickEvent(QGraphicsSceneMouseEvent * /*event*/)
 bool CardZone::showContextMenu(const QPoint &screenPos)
 {
     if (menu) {
-        menu->popup(screenPos);
+        menu->exec(screenPos);
         return true;
     }
     return false;
diff --git a/cockatrice/src/game_graphics/zones/card_zone.h b/cockatrice/src/game_graphics/zones/card_zone.h
index def3eee14..4cef6ca80 100644
--- a/cockatrice/src/game_graphics/zones/card_zone.h
+++ b/cockatrice/src/game_graphics/zones/card_zone.h
@@ -7,21 +7,12 @@
 #ifndef CARDZONE_H
 #define CARDZONE_H
 
+#include "../../game/zones/card_zone_logic.h"
 #include "../board/abstract_graphics_item.h"
 #include "../board/graphics_item_type.h"
 
 #include <QLoggingCategory>
-#include <QPointF>
-#include <qtmetamacros.h>
-
-class CardDragItem;
-class CardItem;
-class CardZoneLogic;
-class QAction;
-class QGraphicsItem;
-class QMenu;
-class QPoint;
-template <typename T> class QList;
+#include <QString>
 
 inline Q_LOGGING_CATEGORY(CardZoneLog, "card_zone");
 
diff --git a/cockatrice/src/game_graphics/zones/hand_zone.cpp b/cockatrice/src/game_graphics/zones/hand_zone.cpp
index 3e527c081..1a8f7a910 100644
--- a/cockatrice/src/game_graphics/zones/hand_zone.cpp
+++ b/cockatrice/src/game_graphics/zones/hand_zone.cpp
@@ -2,27 +2,14 @@
 
 #include "../../client/settings/cache_settings.h"
 #include "../../game/player/player_actions.h"
-#include "../../game/player/player_info.h"
 #include "../../game/player/player_logic.h"
-#include "../../game/zones/card_zone_logic.h"
-#include "../../game/zones/hand_zone_logic.h"
 #include "../../interface/theme_manager.h"
 #include "../board/card_drag_item.h"
 #include "../board/card_item.h"
-#include "../card_dimensions.h"
 
-#include <QBrush>
-#include <QList>
 #include <QPainter>
-#include <QPoint>
-#include <QPointF>
-#include <QRectF>
-#include <QString>
 #include <libcockatrice/protocol/pb/command_move_card.pb.h>
 #include <libcockatrice/settings/interface_settings.h>
-#include <string>
-
-class QGraphicsItem;
 
 HandZone::HandZone(HandZoneLogic *_logic, int _zoneHeight, QGraphicsItem *parent)
     : SelectZone(_logic, parent), zoneHeight(_zoneHeight)
diff --git a/cockatrice/src/game_graphics/zones/hand_zone.h b/cockatrice/src/game_graphics/zones/hand_zone.h
index 5c91d684d..c3f3f252b 100644
--- a/cockatrice/src/game_graphics/zones/hand_zone.h
+++ b/cockatrice/src/game_graphics/zones/hand_zone.h
@@ -7,16 +7,9 @@
 #ifndef HANDZONE_H
 #define HANDZONE_H
 
-#include "../../game/board/card_list.h"
+#include "../../game/zones/hand_zone_logic.h"
 #include "select_zone.h"
 
-#include <QtGlobal>
-#include <qtmetamacros.h>
-
-class HandZoneLogic;
-class QGraphicsItem;
-template <typename T> class QList;
-
 class HandZone : public SelectZone
 {
     Q_OBJECT
diff --git a/cockatrice/src/game_graphics/zones/pile_zone.cpp b/cockatrice/src/game_graphics/zones/pile_zone.cpp
index 77a87a4af..abdf262f4 100644
--- a/cockatrice/src/game_graphics/zones/pile_zone.cpp
+++ b/cockatrice/src/game_graphics/zones/pile_zone.cpp
@@ -1,33 +1,18 @@
 #include "pile_zone.h"
 
 #include "../../client/settings/cache_settings.h"
-#include "../../game/board/card_list.h"
 #include "../../game/player/player_actions.h"
-#include "../../game/player/player_info.h"
 #include "../../game/player/player_logic.h"
-#include "../../game/zones/card_zone_logic.h"
 #include "../../game/zones/pile_zone_logic.h"
 #include "../board/card_drag_item.h"
 #include "../board/card_item.h"
-#include "../card_dimensions.h"
+#include "view_zone.h"
 
 #include <QApplication>
-#include <QCursor>
-#include <QGraphicsItem>
 #include <QGraphicsSceneMouseEvent>
-#include <QList>
 #include <QPainter>
-#include <QPainterPath>
-#include <QPoint>
-#include <QPointF>
-#include <QRectF>
-#include <QString>
-#include <QTransform>
-#include <QtGlobal>
 #include <libcockatrice/protocol/pb/command_move_card.pb.h>
 #include <libcockatrice/settings/cards_display_settings.h>
-#include <qnamespace.h>
-#include <string>
 
 PileZone::PileZone(PileZoneLogic *_logic, QGraphicsItem *parent) : CardZone(_logic, parent)
 {
diff --git a/cockatrice/src/game_graphics/zones/pile_zone.h b/cockatrice/src/game_graphics/zones/pile_zone.h
index b2d8d0cd2..099bc6f60 100644
--- a/cockatrice/src/game_graphics/zones/pile_zone.h
+++ b/cockatrice/src/game_graphics/zones/pile_zone.h
@@ -7,13 +7,9 @@
 #ifndef PILEZONE_H
 #define PILEZONE_H
 
+#include "../../game/zones/pile_zone_logic.h"
 #include "card_zone.h"
 
-#include <qtmetamacros.h>
-
-class PileZoneLogic;
-class QGraphicsItem;
-
 /**
  * A CardZone where the cards are in a single pile instead of being laid out.
  * Usually only top card is accessible by clicking.
diff --git a/cockatrice/src/game_graphics/zones/select_zone.cpp b/cockatrice/src/game_graphics/zones/select_zone.cpp
index d69ec32f5..470c70fcf 100644
--- a/cockatrice/src/game_graphics/zones/select_zone.cpp
+++ b/cockatrice/src/game_graphics/zones/select_zone.cpp
@@ -1,25 +1,13 @@
 #include "select_zone.h"
 
 #include "../../client/settings/cache_settings.h"
-#include "../../game/board/card_list.h"
-#include "../../game/zones/card_zone_logic.h"
 #include "../board/card_item.h"
 #include "../game_scene.h"
 
-#include <QBrush>
-#include <QGraphicsItem>
 #include <QGraphicsRectItem>
-#include <QGraphicsScene>
 #include <QGraphicsSceneMouseEvent>
-#include <QPen>
-#include <QPoint>
-#include <QRectF>
-#include <QTransform>
-#include <QtGlobal>
 #include <QtMath>
 #include <libcockatrice/settings/cards_display_settings.h>
-#include <qnamespace.h>
-#include <qnumeric.h>
 
 static qreal stackingOffset(qreal cardHeight)
 {
diff --git a/cockatrice/src/game_graphics/zones/select_zone.h b/cockatrice/src/game_graphics/zones/select_zone.h
index 8a56949e3..b5d3ca37a 100644
--- a/cockatrice/src/game_graphics/zones/select_zone.h
+++ b/cockatrice/src/game_graphics/zones/select_zone.h
@@ -9,16 +9,10 @@
 
 #include "card_zone.h"
 
-#include <QPointF>
 #include <QSet>
-#include <QtGlobal>
 #include <optional>
-#include <qtmetamacros.h>
 
 class QGraphicsRectItem;
-class CardItem;
-class CardZoneLogic;
-class QGraphicsItem;
 
 /**
  * A CardZone where the cards are laid out, with each card directly interactable by clicking.
diff --git a/cockatrice/src/game_graphics/zones/stack_zone.cpp b/cockatrice/src/game_graphics/zones/stack_zone.cpp
index de1ff8ba9..ff62097c7 100644
--- a/cockatrice/src/game_graphics/zones/stack_zone.cpp
+++ b/cockatrice/src/game_graphics/zones/stack_zone.cpp
@@ -1,27 +1,15 @@
 #include "stack_zone.h"
 
-#include "../../game/board/card_list.h"
 #include "../../game/player/player_actions.h"
-#include "../../game/player/player_info.h"
 #include "../../game/player/player_logic.h"
-#include "../../game/zones/card_zone_logic.h"
 #include "../../game/zones/stack_zone_logic.h"
 #include "../../interface/theme_manager.h"
 #include "../board/card_drag_item.h"
 #include "../board/card_item.h"
 #include "../card_dimensions.h"
 
-#include <QBrush>
-#include <QColor>
-#include <QGraphicsItem>
-#include <QList>
 #include <QPainter>
-#include <QPoint>
-#include <QRectF>
-#include <QString>
 #include <libcockatrice/protocol/pb/command_move_card.pb.h>
-#include <qnumeric.h>
-#include <string>
 
 StackZone::StackZone(StackZoneLogic *_logic, int _zoneHeight, QGraphicsItem *parent)
     : SelectZone(_logic, parent), zoneHeight(_zoneHeight)
diff --git a/cockatrice/src/game_graphics/zones/stack_zone.h b/cockatrice/src/game_graphics/zones/stack_zone.h
index 5dea481b6..96b3f96a6 100644
--- a/cockatrice/src/game_graphics/zones/stack_zone.h
+++ b/cockatrice/src/game_graphics/zones/stack_zone.h
@@ -7,14 +7,9 @@
 #ifndef STACKZONE_H
 #define STACKZONE_H
 
+#include "../../game/zones/stack_zone_logic.h"
 #include "select_zone.h"
 
-#include <QtGlobal>
-#include <qtmetamacros.h>
-
-class QGraphicsItem;
-class StackZoneLogic;
-
 class StackZone : public SelectZone
 {
     Q_OBJECT
diff --git a/cockatrice/src/game_graphics/zones/table_zone.cpp b/cockatrice/src/game_graphics/zones/table_zone.cpp
index b704b79e0..88e9abe6c 100644
--- a/cockatrice/src/game_graphics/zones/table_zone.cpp
+++ b/cockatrice/src/game_graphics/zones/table_zone.cpp
@@ -1,50 +1,23 @@
 #include "table_zone.h"
 
 #include "../../client/settings/cache_settings.h"
-#include "../../game/board/card_list.h"
 #include "../../game/player/player_actions.h"
-#include "../../game/player/player_info.h"
 #include "../../game/player/player_logic.h"
-#include "../../game/zones/card_zone_logic.h"
 #include "../../game/zones/table_zone_logic.h"
 #include "../../interface/theme_manager.h"
-#include "../board/abstract_card_item.h"
+#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 "libcockatrice/card/printing/exact_card.h"
-#include "libcockatrice/protocol/pb/card_attributes.pb.h"
 
-#include <QBrush>
-#include <QColor>
-#include <QGradient>
-#include <QGraphicsItem>
 #include <QGraphicsScene>
-#include <QLinearGradient>
-#include <QList>
-#include <QListIterator>
 #include <QPainter>
-#include <QRectF>
-#include <QSharedPointer>
-#include <QString>
-#include <QtGlobal>
-#include <algorithm>
-#include <iterator>
 #include <libcockatrice/card/card_info.h>
 #include <libcockatrice/protocol/pb/command_move_card.pb.h>
 #include <libcockatrice/protocol/pb/command_set_card_attr.pb.h>
 #include <libcockatrice/settings/interface_settings.h>
 #include <libcockatrice/utility/zone_names.h>
-#include <string>
-
-namespace google
-{
-namespace protobuf
-{
-class Message;
-} // namespace protobuf
-} // namespace google
 
 const QColor TableZone::BACKGROUND_COLOR = QColor(100, 100, 100);
 const QColor TableZone::FADE_MASK = QColor(0, 0, 0, 80);
diff --git a/cockatrice/src/game_graphics/zones/table_zone.h b/cockatrice/src/game_graphics/zones/table_zone.h
index ccd1d8e81..92915a2ed 100644
--- a/cockatrice/src/game_graphics/zones/table_zone.h
+++ b/cockatrice/src/game_graphics/zones/table_zone.h
@@ -7,26 +7,12 @@
 #ifndef TABLEZONE_H
 #define TABLEZONE_H
 
+#include "../../game/zones/table_zone_logic.h"
 #include "../animated_item.h"
-#include "../card_dimensions.h"
+#include "../board/abstract_card_item.h"
 #include "select_zone.h"
 
 #include <QElapsedTimer>
-#include <QMap>
-#include <QPixmap>
-#include <QPoint>
-#include <QPointF>
-#include <QtGlobal>
-#include <qtmetamacros.h>
-
-class CardDragItem;
-class CardItem;
-class CardZoneLogic;
-class QColor;
-class QGraphicsItem;
-class QPainter;
-class TableZoneLogic;
-template <typename T> class QList;
 
 /**
  * @brief TableZone is the grid based rect where CardItems may be placed.
diff --git a/cockatrice/src/game_graphics/zones/view_zone.cpp b/cockatrice/src/game_graphics/zones/view_zone.cpp
index a2aa124dc..5bd5d262f 100644
--- a/cockatrice/src/game_graphics/zones/view_zone.cpp
+++ b/cockatrice/src/game_graphics/zones/view_zone.cpp
@@ -2,29 +2,16 @@
 
 #include "../../client/settings/cache_settings.h"
 #include "../../game/player/player_actions.h"
-#include "../../game/player/player_info.h"
 #include "../../game/player/player_logic.h"
-#include "../../game/zones/card_zone_logic.h"
 #include "../../game/zones/view_zone_logic.h"
 #include "../board/card_drag_item.h"
 #include "../board/card_item.h"
-#include "../card_dimensions.h"
-#include "libcockatrice/card/printing/exact_card.h"
-#include "libcockatrice/filters/filter_string.h"
-#include "libcockatrice/protocol/pb/response.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_zone.pb.h"
-#include "libcockatrice/utility/card_ref.h"
 
 #include <QBrush>
-#include <QColor>
 #include <QDebug>
-#include <QMessageLogger>
-#include <QObject>
+#include <QGraphicsSceneWheelEvent>
 #include <QPainter>
-#include <QSharedPointer>
-#include <QtGlobal>
 #include <QtMath>
-#include <functional>
 #include <libcockatrice/card/card_localization.h>
 #include <libcockatrice/protocol/pb/command_dump_zone.pb.h>
 #include <libcockatrice/protocol/pb/command_move_card.pb.h>
@@ -32,9 +19,6 @@
 #include <libcockatrice/protocol/pb/serverinfo_card.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
 #include <libcockatrice/settings/cards_display_settings.h>
-#include <string>
-
-class QGraphicsItem;
 
 /**
  * @param parent the parent QGraphicsWidget containing the reveal zone
diff --git a/cockatrice/src/game_graphics/zones/view_zone.h b/cockatrice/src/game_graphics/zones/view_zone.h
index 4032da760..9dfa00ce2 100644
--- a/cockatrice/src/game_graphics/zones/view_zone.h
+++ b/cockatrice/src/game_graphics/zones/view_zone.h
@@ -7,29 +7,17 @@
 #ifndef ZONEVIEWERZONE_H
 #define ZONEVIEWERZONE_H
 
-#include "../../game/board/card_list.h"
+#include "../../game/zones/view_zone_logic.h"
 #include "select_zone.h"
 
 #include <QGraphicsLayoutItem>
-#include <QList>
 #include <QLoggingCategory>
-#include <QRectF>
-#include <QSizeF>
-#include <QString>
 #include <libcockatrice/filters/filter_string.h>
-#include <qnamespace.h>
-#include <qtmetamacros.h>
-
-// IWYU pragma: keep
-// ServerInfo_Card appears inside QList<...> in signal and slot
-// signatures, which the moc-generated code needs to be complete.
-#include <libcockatrice/protocol/pb/serverinfo_card.pb.h>
-
-class QGraphicsItem;
-class ZoneViewZoneLogic;
+#include <libcockatrice/protocol/pb/commands.pb.h>
 
 inline Q_LOGGING_CATEGORY(ViewZoneLog, "view_zone");
 
+class ZoneViewWidget;
 class Response;
 class ServerInfo_Card;
 class QGraphicsSceneWheelEvent;
diff --git a/cockatrice/src/game_graphics/zones/view_zone_widget.cpp b/cockatrice/src/game_graphics/zones/view_zone_widget.cpp
index 49d9955e0..fa6733413 100644
--- a/cockatrice/src/game_graphics/zones/view_zone_widget.cpp
+++ b/cockatrice/src/game_graphics/zones/view_zone_widget.cpp
@@ -1,63 +1,32 @@
 #include "view_zone_widget.h"
 
 #include "../../client/settings/cache_settings.h"
-#include "../../client/translation.h"
 #include "../../filters/syntax_help.h"
-#include "../../game/board/card_list.h"
 #include "../../game/player/player_actions.h"
 #include "../../game/player/player_logic.h"
-#include "../../game/zones/card_zone_logic.h"
-#include "../../game/zones/view_zone_logic.h"
 #include "../../interface/pixel_map_generator.h"
-#include "../card_dimensions.h"
+#include "../board/card_item.h"
+#include "../game_scene.h"
 #include "../z_values.h"
-#include "libcockatrice/utility/macros.h"
 #include "view_zone.h"
 
-#include <QAction>
 #include <QCheckBox>
-#include <QCloseEvent>
-#include <QDebug>
-#include <QEvent>
-#include <QFlags>
-#include <QFrame>
-#include <QGraphicsItem>
-#include <QGraphicsLayout>
 #include <QGraphicsLinearLayout>
 #include <QGraphicsProxyWidget>
-#include <QGraphicsScene>
 #include <QGraphicsSceneMouseEvent>
-#include <QGraphicsSceneResizeEvent>
 #include <QGraphicsView>
-#include <QIcon>
-#include <QObject>
-#include <QRect>
+#include <QLabel>
+#include <QPainter>
 #include <QScrollBar>
-#include <QSizeF>
-#include <QSizePolicy>
-#include <QString>
-#include <QStringLiteral>
 #include <QStyle>
 #include <QStyleOption>
-#include <QStyleOptionTitleBar>
-#include <QTimer>
-#include <QVariant>
-#include <QWidget>
-#include <QtGlobal>
 #include <libcockatrice/protocol/pb/command_shuffle.pb.h>
 #include <libcockatrice/settings/cards_display_settings.h>
 #include <libcockatrice/settings/interface_settings.h>
-#include <qnamespace.h>
 
 namespace
 {
-qreal titleBarHeight(QWidget *styleWidget)
-{
-    if (styleWidget) {
-        return static_cast<qreal>(styleWidget->style()->pixelMetric(QStyle::PM_TitleBarHeight, nullptr, styleWidget));
-    }
-    return 24.0;
-}
+constexpr qreal kTitleBarHeight = 24.0;
 constexpr qreal kMinVisibleWidth = 100.0;
 } // namespace
 
@@ -321,8 +290,7 @@ QRectF ZoneViewWidget::closeButtonRect(QWidget *styleWidget) const
 
     // query the style for the close button position (handles macOS top-left placement)
     // Title bar rect MUST be local (0,0-based) for QStyle
-    const qreal tbh = titleBarHeight(styleWidget);
-    const QRect titleBarRect(0, 0, static_cast<int>(frameRectF.width()), static_cast<int>(tbh));
+    const QRect titleBarRect(0, 0, static_cast<int>(frameRectF.width()), static_cast<int>(kTitleBarHeight));
 
     if (styleWidget) {
         QStyleOptionTitleBar opt;
@@ -351,7 +319,7 @@ QRectF ZoneViewWidget::closeButtonRect(QWidget *styleWidget) const
     }
 
     // Fallback: frame-relative top-right
-    return QRectF(frameRectF.right() - tbh, frameRectF.top(), tbh, tbh);
+    return QRectF(frameRectF.right() - kTitleBarHeight, frameRectF.top(), kTitleBarHeight, kTitleBarHeight);
 }
 
 QGraphicsView *ZoneViewWidget::findDragView(QWidget *eventWidget) const
@@ -475,9 +443,8 @@ QVariant ZoneViewWidget::itemChange(GraphicsItemChange change, const QVariant &v
 
         const qreal minX = sceneRect.left();
         const qreal maxX = qMax(minX, sceneRect.right() - kMinVisibleWidth);
-        const qreal tbh = titleBarHeight(nullptr);
-        const qreal minY = sceneRect.top() + tbh;
-        const qreal maxY = qMax(minY, sceneRect.bottom() - tbh);
+        const qreal minY = sceneRect.top() + kTitleBarHeight;
+        const qreal maxY = qMax(minY, sceneRect.bottom() - kTitleBarHeight);
 
         desiredPos.setX(qBound(minX, desiredPos.x(), maxX));
         desiredPos.setY(qBound(minY, desiredPos.y(), maxY));
diff --git a/cockatrice/src/game_graphics/zones/view_zone_widget.h b/cockatrice/src/game_graphics/zones/view_zone_widget.h
index 9fe022b27..de5ad28d5 100644
--- a/cockatrice/src/game_graphics/zones/view_zone_widget.h
+++ b/cockatrice/src/game_graphics/zones/view_zone_widget.h
@@ -6,34 +6,30 @@
 #ifndef ZONEVIEWWIDGET_H
 #define ZONEVIEWWIDGET_H
 
+#include "../../game/zones/card_zone_logic.h"
+
 #include <QCheckBox>
 #include <QComboBox>
 #include <QGraphicsProxyWidget>
 #include <QGraphicsWidget>
 #include <QLineEdit>
-#include <QList>
-#include <QPoint>
-#include <QPointF>
 #include <QPointer>
-#include <QRectF>
-#include <QtGlobal>
 #include <libcockatrice/utility/macros.h>
-#include <qtmetamacros.h>
-
-// IWYU pragma: keep
-// ServerInfo_Card appears inside QList<...> in signal and slot
-// signatures, which the moc-generated code needs to be complete.
-#include <libcockatrice/protocol/pb/serverinfo_card.pb.h>
 
+class QLabel;
+class QPushButton;
+class CardZone;
 class ZoneViewZone;
 class PlayerLogic;
+class CardDatabase;
 class QScrollBar;
+class GameScene;
 class ServerInfo_Card;
 class QGraphicsSceneMouseEvent;
 class QGraphicsSceneWheelEvent;
+class QStyleOption;
 class QGraphicsView;
 class QWidget;
-class CardZoneLogic;
 
 class ScrollableGraphicsProxyWidget : public QGraphicsProxyWidget
 {
diff --git a/cockatrice/src/interface/card_database_update/card_database_update_status_bar.cpp b/cockatrice/src/interface/card_database_update/card_database_update_status_bar.cpp
deleted file mode 100644
index 721fdd6c8..000000000
--- a/cockatrice/src/interface/card_database_update/card_database_update_status_bar.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-#include "card_database_update_status_bar.h"
-
-#include <QCoreApplication>
-#include <QEvent>
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QProgressBar>
-#include <QtGlobal>
-#include <climits>
-
-namespace
-{
-/**
- * @brief Translated name of one updater stage.
- * @param fallback shown when the stage is unknown or not reported yet
- */
-QString stageName(CardUpdateStage stage, const QString &fallback)
-{
-    switch (stage) {
-        case CardUpdateStage::Download:
-            return QCoreApplication::translate("CardDatabaseUpdateStatusBar", "Downloading");
-        case CardUpdateStage::Scan:
-            return QCoreApplication::translate("CardDatabaseUpdateStatusBar", "Parsing");
-        case CardUpdateStage::Import:
-            return QCoreApplication::translate("CardDatabaseUpdateStatusBar", "Importing");
-        case CardUpdateStage::Unknown:
-            return fallback;
-    }
-    return fallback;
-}
-} // namespace
-
-CardDatabaseUpdateStatusBar::CardDatabaseUpdateStatusBar(QWidget *parent) : QWidget(parent)
-{
-    layout = new QHBoxLayout(this);
-    layout->setContentsMargins(0, 0, 0, 0);
-
-    stageLabel = new QLabel(this);
-    progressBar = new QProgressBar(this);
-    progressBar->setMinimumWidth(120);
-
-    layout->addWidget(stageLabel);
-    layout->addWidget(progressBar);
-
-    setLayout(layout);
-    refresh();
-    hide();
-}
-
-QString CardDatabaseUpdateStatusBar::statusText() const
-{
-    if (!active) {
-        return {};
-    }
-    const QString name = stageName(progress.stage, tr("Updating the card database"));
-    if (progress.total <= 0) {
-        return name;
-    }
-    const int percent = static_cast<int>((100.0 * progress.done) / progress.total);
-    return tr("%1 (%2%)").arg(name).arg(percent);
-}
-
-void CardDatabaseUpdateStatusBar::updateStarted()
-{
-    active = true;
-    progress = {};
-    refresh();
-    show();
-}
-
-void CardDatabaseUpdateStatusBar::updateProgress(const CardUpdateProgress &progress)
-{
-    active = true;
-    this->progress = progress;
-    refresh();
-}
-
-void CardDatabaseUpdateStatusBar::updateFinished()
-{
-    active = false;
-    progress = {};
-    refresh();
-    hide();
-}
-
-void CardDatabaseUpdateStatusBar::changeEvent(QEvent *event)
-{
-    if (event->type() == QEvent::LanguageChange) {
-        refresh();
-    }
-    QWidget::changeEvent(event);
-}
-
-void CardDatabaseUpdateStatusBar::refresh()
-{
-    const QString name = stageName(progress.stage, tr("Updating the card database"));
-    stageLabel->setText(name);
-
-    const qint64 cappedTotal = qMin<qint64>(progress.total, INT_MAX);
-    const qint64 cappedDone = qMin<qint64>(progress.done, INT_MAX);
-    const int minimum = 0;
-    const int maximum = static_cast<int>(cappedTotal);
-    if (progressBar->minimum() != minimum || progressBar->maximum() != maximum) {
-        // A zero range is the busy indicator, used until the first report arrives.
-        progressBar->setRange(minimum, maximum);
-    }
-    progressBar->setValue(static_cast<int>(cappedDone));
-
-    if (active && progress.total > 0) {
-        const int percent = static_cast<int>((100.0 * progress.done) / progress.total);
-        setToolTip(tr("Card database update in progress: %1 (%2%)").arg(name).arg(percent));
-    } else if (active) {
-        setToolTip(tr("Card database update in progress."));
-    } else {
-        setToolTip({});
-    }
-}
diff --git a/cockatrice/src/interface/card_database_update/card_database_update_status_bar.h b/cockatrice/src/interface/card_database_update/card_database_update_status_bar.h
deleted file mode 100644
index 6db3bd225..000000000
--- a/cockatrice/src/interface/card_database_update/card_database_update_status_bar.h
+++ /dev/null
@@ -1,68 +0,0 @@
-#ifndef CARD_DATABASE_UPDATE_STATUS_BAR_H
-#define CARD_DATABASE_UPDATE_STATUS_BAR_H
-
-#include "card_update_progress.h"
-
-#include <QString>
-#include <QWidget>
-#include <qtmetamacros.h>
-
-class QEvent;
-class QHBoxLayout;
-class QLabel;
-class QProgressBar;
-
-/**
- * @class CardDatabaseUpdateStatusBar
- * @brief Status bar widget showing what the card database updater (Oracle) is doing.
- *
- * The updater runs as a separate process, so this widget is the in-client view of
- * its progress: it appears when an update starts, tracks the download/scan/import
- * stages reported by the updater, and disappears when the update finishes.
- */
-class CardDatabaseUpdateStatusBar : public QWidget
-{
-    Q_OBJECT
-public:
-    /**
-     * @brief Constructs a hidden progress widget.
-     * @param parent Parent widget
-     */
-    explicit CardDatabaseUpdateStatusBar(QWidget *parent = nullptr);
-
-    /**
-     * @brief Human readable description of the running stage, e.g. "Downloading (42%)".
-     * @return the description, or an empty string when no update is running
-     */
-    QString statusText() const;
-
-public slots:
-    /**
-     * @brief Shows the widget and resets it to the indeterminate state.
-     */
-    void updateStarted();
-
-    /**
-     * @brief Shows the progress of one update stage.
-     */
-    void updateProgress(const CardUpdateProgress &progress);
-
-    /**
-     * @brief Hides the widget and clears the reported progress.
-     */
-    void updateFinished();
-
-protected:
-    void changeEvent(QEvent *event) override;
-
-private:
-    void refresh();
-
-    QHBoxLayout *layout;         ///< Horizontal layout holding the stage label and the progress bar
-    QLabel *stageLabel;          ///< Name of the stage currently running
-    QProgressBar *progressBar;   ///< Progress within the current stage
-    CardUpdateProgress progress; ///< Last reported progress
-    bool active = false;         ///< Whether an update is currently running
-};
-
-#endif // CARD_DATABASE_UPDATE_STATUS_BAR_H
diff --git a/cockatrice/src/interface/card_database_update/card_update_progress.cpp b/cockatrice/src/interface/card_database_update/card_update_progress.cpp
deleted file mode 100644
index 1f8e500d0..000000000
--- a/cockatrice/src/interface/card_database_update/card_update_progress.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-#include "card_update_progress.h"
-
-#include <QList>
-
-namespace
-{
-CardUpdateStage parseStage(const QByteArray &token)
-{
-    if (token == "download") {
-        return CardUpdateStage::Download;
-    }
-    if (token == "scan") {
-        return CardUpdateStage::Scan;
-    }
-    if (token == "import") {
-        return CardUpdateStage::Import;
-    }
-    return CardUpdateStage::Unknown;
-}
-} // namespace
-
-std::optional<CardUpdateProgress> CardUpdateProgress::fromProtocolLine(const QByteArray &line)
-{
-    const QByteArray trimmed = line.trimmed();
-    if (!trimmed.startsWith("PROGRESS ")) {
-        return std::nullopt;
-    }
-    const QList<QByteArray> parts = trimmed.split(' ');
-    if (parts.size() != 4) {
-        return std::nullopt;
-    }
-    bool doneOk = false;
-    bool totalOk = false;
-    const qint64 done = parts.at(2).toLongLong(&doneOk);
-    const qint64 total = parts.at(3).toLongLong(&totalOk);
-    if (!doneOk || !totalOk || done < 0 || total < 0) {
-        return std::nullopt;
-    }
-    CardUpdateProgress progress;
-    progress.stage = parseStage(parts.at(1));
-    progress.done = done;
-    progress.total = total;
-    return progress;
-}
-
-QString CardUpdateProgress::stageToken() const
-{
-    switch (stage) {
-        case CardUpdateStage::Download:
-            return QStringLiteral("download");
-        case CardUpdateStage::Scan:
-            return QStringLiteral("scan");
-        case CardUpdateStage::Import:
-            return QStringLiteral("import");
-        case CardUpdateStage::Unknown:
-            return QStringLiteral("unknown");
-    }
-    return QStringLiteral("unknown");
-}
diff --git a/cockatrice/src/interface/card_database_update/card_update_progress.h b/cockatrice/src/interface/card_database_update/card_update_progress.h
deleted file mode 100644
index 743f32209..000000000
--- a/cockatrice/src/interface/card_database_update/card_update_progress.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifndef CARD_UPDATE_PROGRESS_H
-#define CARD_UPDATE_PROGRESS_H
-
-#include <QByteArray>
-#include <QString>
-#include <QtGlobal>
-#include <optional>
-
-/**
- * @brief One stage of the card database updater's progress protocol.
- */
-enum class CardUpdateStage
-{
-    Download, ///< downloading the source data
-    Scan,     ///< parsing the downloaded data
-    Import,   ///< importing cards into the database
-    Unknown,  ///< a stage the client does not recognize
-};
-
-/**
- * @brief One progress line read from the card database updater's stdout.
- */
-struct CardUpdateProgress
-{
-    /**
-     * @brief Parses one line of the updater stdout protocol: "PROGRESS <stage> <done> <total>".
-     * @param line a single stdout line, with or without its trailing newline
-     * @return the parsed progress, or @c std::nullopt when the line is not a valid progress line
-     */
-    static std::optional<CardUpdateProgress> fromProtocolLine(const QByteArray &line);
-
-    /**
-     * @brief Protocol token of the stage ("download", "scan", "import" or "unknown"), for logging.
-     */
-    QString stageToken() const;
-
-    CardUpdateStage stage = CardUpdateStage::Unknown;
-    qint64 done = 0;
-    qint64 total = 0;
-};
-
-#endif // CARD_UPDATE_PROGRESS_H
diff --git a/cockatrice/src/interface/card_localization.h b/cockatrice/src/interface/card_localization.h
index 39cbd7700..1a1e7be5d 100644
--- a/cockatrice/src/interface/card_localization.h
+++ b/cockatrice/src/interface/card_localization.h
@@ -6,7 +6,6 @@
 #include <QString>
 #include <libcockatrice/card/card_info.h>
 #include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/card/database/card_database_querier.h>
 #include <libcockatrice/settings/cards_display_settings.h>
 
 namespace CardLocalization
diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader.cpp b/cockatrice/src/interface/card_picture_loader/card_picture_loader.cpp
index 4f77c7096..8e34942e1 100644
--- a/cockatrice/src/interface/card_picture_loader/card_picture_loader.cpp
+++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader.cpp
@@ -4,45 +4,27 @@
 #include "../pixel_map_generator.h"
 #include "card_picture_loader_cache_method.h"
 #include "card_picture_loader_local_schemes.h"
-#include "card_picture_loader_status_bar.h"
-#include "card_picture_loader_worker.h"
-#include "libcockatrice/card/card_info.h"
-#include "libcockatrice/card/printing/exact_card.h"
-#include "libcockatrice/card/printing/printing_info.h"
-#include "libcockatrice/card/set/card_set.h"
 
 #include <QApplication>
-#include <QChar>
-#include <QColor>
-#include <QDateTime>
+#include <QBuffer>
 #include <QDebug>
 #include <QDir>
-#include <QFile>
 #include <QFileInfo>
-#include <QImage>
-#include <QLatin1Char>
-#include <QList>
 #include <QMainWindow>
-#include <QMessageLogger>
 #include <QMetaObject>
-#include <QMetaType>
-#include <QPixmap>
+#include <QMovie>
+#include <QNetworkRequest>
+#include <QPainter>
 #include <QPixmapCache>
 #include <QScreen>
-#include <QSharedPointer>
-#include <QSize>
 #include <QStatusBar>
-#include <QString>
-#include <QStringLiteral>
 #include <QThread>
-#include <QWidget>
-#include <QtGlobal>
-#include <compare>
+#include <algorithm>
 #include <libcockatrice/settings/cache_storage_settings.h>
 #include <libcockatrice/settings/cards_display_settings.h>
 #include <libcockatrice/settings/download_settings.h>
 #include <libcockatrice/settings/paths_settings.h>
-#include <qnamespace.h>
+#include <utility>
 
 // never cache more than 300 cards at once for a single deck
 #define CACHED_CARD_PER_DECK_MAX 300
diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader.h b/cockatrice/src/interface/card_picture_loader/card_picture_loader.h
index c6d91570b..6224befbf 100644
--- a/cockatrice/src/interface/card_picture_loader/card_picture_loader.h
+++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader.h
@@ -1,20 +1,12 @@
 #ifndef CARD_PICTURE_LOADER_H
 #define CARD_PICTURE_LOADER_H
 
+#include "card_picture_loader_status_bar.h"
+#include "card_picture_loader_worker.h"
+
+#include <QDateTime>
 #include <QHash>
 #include <QLoggingCategory>
-#include <QObject>
-#include <qtmetamacros.h>
-
-class CardPictureLoaderStatusBar;
-class CardPictureLoaderWorker;
-class ExactCard;
-class QDateTime;
-class QImage;
-class QPixmap;
-class QSize;
-class QString;
-template <typename T> class QList;
 
 inline Q_LOGGING_CATEGORY(CardPictureLoaderLog, "card_picture_loader");
 inline Q_LOGGING_CATEGORY(CardPictureLoaderCardBackCacheFailLog, "card_picture_loader.card_back_cache_fail");
diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader_local.cpp b/cockatrice/src/interface/card_picture_loader/card_picture_loader_local.cpp
index 1437e23f4..12165e8f3 100644
--- a/cockatrice/src/interface/card_picture_loader/card_picture_loader_local.cpp
+++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader_local.cpp
@@ -2,21 +2,11 @@
 
 #include "../../client/settings/cache_settings.h"
 #include "card_picture_loader_local_schemes.h"
-#include "libcockatrice/card/card_info.h"
-#include "libcockatrice/card/printing/exact_card.h"
-#include "libcockatrice/card/printing/printing_info.h"
-#include "libcockatrice/card/set/card_set.h"
+#include "card_picture_to_load.h"
 
-#include <QDebug>
-#include <QDir>
 #include <QDirIterator>
-#include <QFileInfo>
-#include <QImageReader>
-#include <QList>
-#include <QMessageLogger>
-#include <QSharedPointer>
-#include <QStringList>
-#include <QTimer>
+#include <QMovie>
+#include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/settings/paths_settings.h>
 
 static constexpr int REFRESH_INTERVAL_MS = 10 * 1000;
diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader_local.h b/cockatrice/src/interface/card_picture_loader/card_picture_loader_local.h
index 009897acc..44163d1db 100644
--- a/cockatrice/src/interface/card_picture_loader/card_picture_loader_local.h
+++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader_local.h
@@ -1,15 +1,8 @@
 #ifndef PICTURE_LOADER_LOCAL_H
 #define PICTURE_LOADER_LOCAL_H
 
-#include <QImage>
-#include <QLoggingCategory>
-#include <QMultiHash>
-#include <QObject>
-#include <QString>
-#include <qtmetamacros.h>
-
-class ExactCard;
-class QTimer;
+#include <QTimer>
+#include <libcockatrice/card/printing/exact_card.h>
 
 inline Q_LOGGING_CATEGORY(CardPictureLoaderLocalLog, "card_picture_loader.local");
 
diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader_request_status_display_widget.cpp b/cockatrice/src/interface/card_picture_loader/card_picture_loader_request_status_display_widget.cpp
index 98364e3cb..d1895af06 100644
--- a/cockatrice/src/interface/card_picture_loader/card_picture_loader_request_status_display_widget.cpp
+++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader_request_status_display_widget.cpp
@@ -1,11 +1,5 @@
 #include "card_picture_loader_request_status_display_widget.h"
 
-#include "libcockatrice/card/printing/exact_card.h"
-#include "libcockatrice/card/printing/printing_info.h"
-
-#include <QHBoxLayout>
-#include <QUrl>
-
 CardPictureLoaderRequestStatusDisplayWidget::CardPictureLoaderRequestStatusDisplayWidget(QWidget *parent,
                                                                                          const QUrl &_url,
                                                                                          const ExactCard &card,
diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader_request_status_display_widget.h b/cockatrice/src/interface/card_picture_loader/card_picture_loader_request_status_display_widget.h
index 58051cc1e..c9a272b68 100644
--- a/cockatrice/src/interface/card_picture_loader/card_picture_loader_request_status_display_widget.h
+++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader_request_status_display_widget.h
@@ -1,16 +1,11 @@
 #ifndef PICTURE_LOADER_REQUEST_STATUS_DISPLAY_WIDGET_H
 #define PICTURE_LOADER_REQUEST_STATUS_DISPLAY_WIDGET_H
 
-#include <QDateTime>
+#include <QHBoxLayout>
 #include <QLabel>
-#include <QSharedPointer>
-#include <QString>
+#include <QUrl>
 #include <QWidget>
-#include <qtmetamacros.h>
-
-class ExactCard;
-class QHBoxLayout;
-class QUrl;
+#include <libcockatrice/card/printing/exact_card.h>
 
 /**
  * @class CardPictureLoaderRequestStatusDisplayWidget
diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader_status_bar.cpp b/cockatrice/src/interface/card_picture_loader/card_picture_loader_status_bar.cpp
index 3b26c8033..9e7e645bd 100644
--- a/cockatrice/src/interface/card_picture_loader/card_picture_loader_status_bar.cpp
+++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader_status_bar.cpp
@@ -1,19 +1,7 @@
 #include "card_picture_loader_status_bar.h"
 
-#include "../widgets/quick_settings/settings_button_widget.h"
-#include "../widgets/quick_settings/settings_popup_widget.h"
 #include "card_picture_loader_request_status_display_widget.h"
 
-#include <QDateTime>
-#include <QHBoxLayout>
-#include <QList>
-#include <QProgressBar>
-#include <QSharedPointer>
-#include <QTimer>
-#include <QUrl>
-
-class ExactCard;
-
 CardPictureLoaderStatusBar::CardPictureLoaderStatusBar(QWidget *parent) : QWidget(parent)
 {
     layout = new QHBoxLayout(this);
diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader_status_bar.h b/cockatrice/src/interface/card_picture_loader/card_picture_loader_status_bar.h
index 2ba386c42..7f1f509db 100644
--- a/cockatrice/src/interface/card_picture_loader/card_picture_loader_status_bar.h
+++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader_status_bar.h
@@ -1,16 +1,12 @@
 #ifndef PICTURE_LOADER_STATUS_BAR_H
 #define PICTURE_LOADER_STATUS_BAR_H
 
-#include <QString>
-#include <QWidget>
-#include <qtmetamacros.h>
+#include "../../interface/widgets/quick_settings/settings_button_widget.h"
+#include "card_picture_loader_worker_work.h"
 
-class ExactCard;
-class QHBoxLayout;
-class QProgressBar;
-class QTimer;
-class QUrl;
-class SettingsButtonWidget;
+#include <QHBoxLayout>
+#include <QProgressBar>
+#include <QWidget>
 
 /**
  * @class CardPictureLoaderStatusBar
diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker.cpp b/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker.cpp
index 150b4c544..0fd6a42d5 100644
--- a/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker.cpp
+++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker.cpp
@@ -4,34 +4,15 @@
 #include "card_picture_loader_cache_method.h"
 #include "card_picture_loader_local.h"
 #include "card_picture_loader_worker_work.h"
-#include "card_picture_to_load.h"
-#include "libcockatrice/card/printing/exact_card.h"
-#include "libcockatrice/utility/server_rate_limiter.h"
 
-#include <QAbstractNetworkCache>
-#include <QByteArray>
-#include <QCoreApplication>
-#include <QDateTime>
-#include <QDebug>
-#include <QImage>
-#include <QMessageLogger>
-#include <QMetaObject>
-#include <QMetaType>
-#include <QNetworkAccessManager>
-#include <QNetworkCacheMetaData>
+#include <QDirIterator>
+#include <QMovie>
 #include <QNetworkDiskCache>
 #include <QNetworkReply>
-#include <QNetworkRequest>
-#include <QSettings>
-#include <QSharedPointer>
 #include <QThread>
-#include <QVariant>
-#include <QtGlobal>
-#include <compare>
 #include <libcockatrice/settings/cache_storage_settings.h>
 #include <libcockatrice/settings/download_settings.h>
 #include <libcockatrice/settings/paths_settings.h>
-#include <qnamespace.h>
 #include <utility>
 #include <version_string.h>
 
diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker.h b/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker.h
index 4b42c6e59..8b136f309 100644
--- a/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker.h
+++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker.h
@@ -1,25 +1,21 @@
 #ifndef PICTURE_LOADER_WORKER_H
 #define PICTURE_LOADER_WORKER_H
 
+#include "card_picture_loader_local.h"
+#include "card_picture_loader_worker_work.h"
+#include "card_picture_to_load.h"
+
+#include <QDateTime>
 #include <QHash>
 #include <QLoggingCategory>
+#include <QMutex>
+#include <QNetworkAccessManager>
+#include <QNetworkDiskCache>
 #include <QObject>
-#include <QPair>
 #include <QQueue>
-#include <QSet>
-#include <QString>
 #include <QTimer>
-#include <QUrl>
-#include <qtmetamacros.h>
-
-class CardPictureLoaderLocal;
-class ExactCard;
-class QDateTime;
-class QImage;
-class QNetworkAccessManager;
-class QNetworkDiskCache;
-class QNetworkReply;
-class QThread;
+#include <libcockatrice/card/card_info.h>
+#include <libcockatrice/card/database/card_database.h>
 
 #define REDIRECT_HEADER_NAME "redirects"
 #define REDIRECT_ORIGINAL_URL "original"
diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker_work.cpp b/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker_work.cpp
index 92524384a..19c6be469 100644
--- a/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker_work.cpp
+++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker_work.cpp
@@ -2,35 +2,19 @@
 
 #include "../../client/settings/cache_settings.h"
 #include "card_picture_loader_worker.h"
-#include "card_picture_to_load.h"
-#include "libcockatrice/card/card_info.h"
-#include "libcockatrice/card/printing/exact_card.h"
-#include "libcockatrice/utility/server_rate_limiter.h"
 
 #include <QBuffer>
-#include <QByteArray>
-#include <QCryptographicHash>
-#include <QDateTime>
-#include <QDebug>
-#include <QImageReader>
-#include <QList>
+#include <QDirIterator>
 #include <QLoggingCategory>
-#include <QMessageLogger>
 #include <QMovie>
 #include <QNetworkReply>
-#include <QNetworkRequest>
 #include <QRandomGenerator>
-#include <QSharedPointer>
-#include <QStringList>
+#include <QThread>
+#include <QThreadPool>
 #include <QTimer>
-#include <QUrl>
-#include <QVariant>
 
 ServerRateLimiter CardPictureLoaderWorkerWork::s_rateLimiter;
-#include <QtGlobal>
 #include <libcockatrice/settings/download_settings.h>
-#include <qnamespace.h>
-#include <qobjectdefs.h>
 
 // Card back returned by gatherer when card is not found
 static const QStringList MD5_BLACKLIST = {
diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker_work.h b/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker_work.h
index c3dbcc6e8..84a7dafdb 100644
--- a/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker_work.h
+++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker_work.h
@@ -1,18 +1,19 @@
 #ifndef PICTURE_LOADER_WORKER_WORK_H
 #define PICTURE_LOADER_WORKER_WORK_H
 
+#include "card_picture_loader_worker.h"
 #include "card_picture_to_load.h"
 
-#include <QImage>
+#include <QDateTime>
 #include <QLoggingCategory>
+#include <QMutex>
+#include <QNetworkAccessManager>
 #include <QObject>
+#include <QRandomGenerator>
 #include <QString>
-#include <qtmetamacros.h>
-
-class ExactCard;
-class QNetworkReply;
-class QUrl;
-class ServerRateLimiter;
+#include <QThread>
+#include <libcockatrice/card/database/card_database.h>
+#include <libcockatrice/utility/server_rate_limiter.h>
 
 inline Q_LOGGING_CATEGORY(CardPictureLoaderWorkerWorkLog, "card_picture_loader.worker");
 
diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_to_load.cpp b/cockatrice/src/interface/card_picture_loader/card_picture_to_load.cpp
index e35c417c8..4f933207e 100644
--- a/cockatrice/src/interface/card_picture_loader/card_picture_to_load.cpp
+++ b/cockatrice/src/interface/card_picture_loader/card_picture_to_load.cpp
@@ -1,22 +1,12 @@
 #include "card_picture_to_load.h"
 
 #include "../../client/settings/cache_settings.h"
-#include "libcockatrice/card/printing/exact_card.h"
-#include "libcockatrice/card/printing/printing_info.h"
-#include "libcockatrice/card/set/card_set.h"
 
+#include <QCoreApplication>
 #include <QDate>
-#include <QDebug>
-#include <QMap>
-#include <QMessageLogger>
 #include <QRegularExpression>
-#include <QRegularExpressionMatch>
-#include <QRegularExpressionMatchIterator>
-#include <QSharedPointer>
 #include <QUrl>
-#include <QtGlobal>
 #include <algorithm>
-#include <functional>
 #include <libcockatrice/card/set/card_set_comparator.h>
 #include <libcockatrice/interfaces/noop_card_set_priority_controller.h>
 #include <libcockatrice/settings/cards_display_settings.h>
diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_to_load.h b/cockatrice/src/interface/card_picture_loader/card_picture_to_load.h
index fe56dc4c6..9e0e7449c 100644
--- a/cockatrice/src/interface/card_picture_loader/card_picture_to_load.h
+++ b/cockatrice/src/interface/card_picture_loader/card_picture_to_load.h
@@ -1,12 +1,6 @@
 #ifndef PICTURE_TO_LOAD_H
 #define PICTURE_TO_LOAD_H
 
-#include "libcockatrice/card/card_info.h"
-
-#include <QList>
-#include <QLoggingCategory>
-#include <QSharedPointer>
-#include <QString>
 #include <libcockatrice/card/printing/exact_card.h>
 
 inline Q_LOGGING_CATEGORY(CardPictureToLoadLog, "card_picture_loader.picture_to_load");
diff --git a/cockatrice/src/interface/deck_loader/card_node_function.cpp b/cockatrice/src/interface/deck_loader/card_node_function.cpp
index 8d59a6c15..9441fe428 100644
--- a/cockatrice/src/interface/deck_loader/card_node_function.cpp
+++ b/cockatrice/src/interface/deck_loader/card_node_function.cpp
@@ -1,12 +1,5 @@
 #include "card_node_function.h"
 
-#include "libcockatrice/card/database/card_database_querier.h"
-#include "libcockatrice/card/printing/printing_info.h"
-#include "libcockatrice/card/set/card_set.h"
-
-#include <QSharedPointer>
-#include <QString>
-#include <QtGlobal>
 #include <libcockatrice/card/database/card_database.h>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/deck_list/tree/deck_list_card_node.h>
@@ -15,14 +8,13 @@ void CardNodeFunction::SetProviderIdToPreferred::operator()(const InnerDecklistN
 {
     Q_UNUSED(node);
     PrintingInfo preferredPrinting = CardDatabaseManager::query()->getPreferredPrinting(card->getName());
-    CardSetPtr preferredSet = preferredPrinting.getSet();
-    if (!preferredSet) {
-        return;
-    }
+    QString providerId = preferredPrinting.getUuid();
+    QString setShortName = preferredPrinting.getSet()->getShortName();
+    QString collectorNumber = preferredPrinting.getProperty("num");
 
-    card->setCardProviderId(preferredPrinting.getUuid());
-    card->setCardCollectorNumber(preferredPrinting.getProperty("num"));
-    card->setCardSetShortName(preferredSet->getShortName());
+    card->setCardProviderId(providerId);
+    card->setCardCollectorNumber(collectorNumber);
+    card->setCardSetShortName(setShortName);
 }
 
 void CardNodeFunction::ClearPrintingData::operator()(const InnerDecklistNode *node, DecklistCardNode *card) const
diff --git a/cockatrice/src/interface/deck_loader/deck_file_format.cpp b/cockatrice/src/interface/deck_loader/deck_file_format.cpp
index ba5a44e4c..3c88cde4e 100644
--- a/cockatrice/src/interface/deck_loader/deck_file_format.cpp
+++ b/cockatrice/src/interface/deck_loader/deck_file_format.cpp
@@ -1,7 +1,5 @@
 #include "deck_file_format.h"
 
-#include <qnamespace.h>
-
 DeckFileFormat::Format DeckFileFormat::getFormatFromName(const QString &fileName)
 {
     if (fileName.endsWith(".cod", Qt::CaseInsensitive)) {
diff --git a/cockatrice/src/interface/deck_loader/deck_loader.cpp b/cockatrice/src/interface/deck_loader/deck_loader.cpp
index d413a6c04..f29b4eed2 100644
--- a/cockatrice/src/interface/deck_loader/deck_loader.cpp
+++ b/cockatrice/src/interface/deck_loader/deck_loader.cpp
@@ -1,51 +1,26 @@
 #include "deck_loader.h"
 
-#include "libcockatrice/card/card_info.h"
-#include "libcockatrice/card/database/card_database_querier.h"
-#include "libcockatrice/deck_list/tree/abstract_deck_list_card_node.h"
-#include "libcockatrice/deck_list/tree/abstract_deck_list_node.h"
-#include "libcockatrice/deck_list/tree/inner_deck_list_node.h"
-
 #include <QApplication>
 #include <QClipboard>
-#include <QDateTime>
 #include <QDebug>
 #include <QDir>
 #include <QFile>
-#include <QFileDevice>
 #include <QFileInfo>
-#include <QFont>
-#include <QFuture>
-#include <QIODevice>
-#include <QList>
-#include <QMap>
-#include <QMessageLogger>
-#include <QMultiMap>
+#include <QFutureWatcher>
 #include <QPrinter>
 #include <QRegularExpression>
 #include <QSaveFile>
-#include <QSet>
-#include <QSharedPointer>
 #include <QStringList>
-#include <QTextBlockFormat>
-#include <QTextCharFormat>
 #include <QTextCursor>
 #include <QTextDocument>
-#include <QTextLength>
 #include <QTextStream>
 #include <QTextTable>
-#include <QTextTableCell>
-#include <QTextTableFormat>
-#include <QVector>
 #include <QtConcurrentRun>
-#include <functional>
+#include <libcockatrice/card/database/card_database.h>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/card/import/card_name_normalizer.h>
 #include <libcockatrice/deck_list/deck_list.h>
 #include <libcockatrice/deck_list/tree/deck_list_card_node.h>
-#include <qnamespace.h>
-
-class QTextLength;
 
 const QStringList DeckLoader::ACCEPTED_FILE_EXTENSIONS = {"*.cod", "*.dec", "*.dek", "*.txt", "*.mwDeck"};
 
diff --git a/cockatrice/src/interface/deck_loader/deck_loader.h b/cockatrice/src/interface/deck_loader/deck_loader.h
index 16402b14b..be0df311d 100644
--- a/cockatrice/src/interface/deck_loader/deck_loader.h
+++ b/cockatrice/src/interface/deck_loader/deck_loader.h
@@ -7,23 +7,13 @@
 #ifndef DECK_LOADER_H
 #define DECK_LOADER_H
 
-#include "deck_file_format.h"
 #include "loaded_deck.h"
 
 #include <QLoggingCategory>
-#include <QObject>
-#include <QString>
-#include <QStringList>
+#include <QPrinter>
+#include <QTextCursor>
+#include <libcockatrice/deck_list/deck_list.h>
 #include <optional>
-#include <qtmetamacros.h>
-
-class DeckList;
-class DecklistCardNode;
-class InnerDecklistNode;
-class QPrinter;
-class QTextCursor;
-class QTextStream;
-template <typename T> class QList;
 
 inline Q_LOGGING_CATEGORY(DeckLoaderLog, "deck_loader");
 
diff --git a/cockatrice/src/interface/intents/intent.h b/cockatrice/src/interface/intents/intent.h
index ad8d4b5af..5d9fdd3d6 100644
--- a/cockatrice/src/interface/intents/intent.h
+++ b/cockatrice/src/interface/intents/intent.h
@@ -2,8 +2,6 @@
 #define COCKATRICE_INTENT_H
 
 #include <QObject>
-#include <QString>
-#include <qtmetamacros.h>
 
 class Intent : public QObject
 {
diff --git a/cockatrice/src/interface/intents/intent_connect_to_server.cpp b/cockatrice/src/interface/intents/intent_connect_to_server.cpp
index 42ddc97cc..1cccc5a23 100644
--- a/cockatrice/src/interface/intents/intent_connect_to_server.cpp
+++ b/cockatrice/src/interface/intents/intent_connect_to_server.cpp
@@ -1,14 +1,8 @@
 #include "intent_connect_to_server.h"
 
-#include "contexts/context_connect_to_server.h"
 #include "intent_disconnect_from_server.h"
-#include "libcockatrice/protocol/pb/response.pb.h"
-#include "remote_client.h"
 
 #include <QTimer>
-#include <QtGlobal>
-
-template <typename T> class QList;
 
 IntentConnectToServer::IntentConnectToServer(RemoteClient *_remoteClient, ContextConnectToServer *_context)
     : Intent(), remoteClient(_remoteClient), context(_context)
diff --git a/cockatrice/src/interface/intents/intent_connect_to_server.h b/cockatrice/src/interface/intents/intent_connect_to_server.h
index 50d7f088b..eab4d1a21 100644
--- a/cockatrice/src/interface/intents/intent_connect_to_server.h
+++ b/cockatrice/src/interface/intents/intent_connect_to_server.h
@@ -1,14 +1,9 @@
 #ifndef COCKATRICE_INTENT_CONNECT_TO_SERVER_H
 #define COCKATRICE_INTENT_CONNECT_TO_SERVER_H
 
-#include "abstract_client.h"
+#include "contexts/context_connect_to_server.h"
 #include "intent.h"
-
-#include <QString>
-#include <qtmetamacros.h>
-
-class RemoteClient;
-struct ContextConnectToServer;
+#include "remote_client.h"
 
 class IntentConnectToServer : public Intent
 {
diff --git a/cockatrice/src/interface/intents/intent_disconnect_from_server.cpp b/cockatrice/src/interface/intents/intent_disconnect_from_server.cpp
index e865c4a2b..cb39d7bab 100644
--- a/cockatrice/src/interface/intents/intent_disconnect_from_server.cpp
+++ b/cockatrice/src/interface/intents/intent_disconnect_from_server.cpp
@@ -1,7 +1,5 @@
 #include "intent_disconnect_from_server.h"
 
-#include "remote_client.h"
-
 IntentDisconnectFromServer::IntentDisconnectFromServer(RemoteClient *_remoteClient)
     : Intent(), remoteClient(_remoteClient)
 {
diff --git a/cockatrice/src/interface/intents/intent_disconnect_from_server.h b/cockatrice/src/interface/intents/intent_disconnect_from_server.h
index 5425e973b..6e1dfd0c1 100644
--- a/cockatrice/src/interface/intents/intent_disconnect_from_server.h
+++ b/cockatrice/src/interface/intents/intent_disconnect_from_server.h
@@ -1,12 +1,8 @@
 #ifndef COCKATRICE_INTENT_DISCONNECT_FROM_SERVER_H
 #define COCKATRICE_INTENT_DISCONNECT_FROM_SERVER_H
 
-#include "abstract_client.h"
 #include "intent.h"
-
-#include <qtmetamacros.h>
-
-class RemoteClient;
+#include "remote_client.h"
 
 class IntentDisconnectFromServer : public Intent
 {
diff --git a/cockatrice/src/interface/intents/intent_join_server_game.cpp b/cockatrice/src/interface/intents/intent_join_server_game.cpp
index 52e02b276..b22b200ed 100644
--- a/cockatrice/src/interface/intents/intent_join_server_game.cpp
+++ b/cockatrice/src/interface/intents/intent_join_server_game.cpp
@@ -3,17 +3,9 @@
 #include "../widgets/server/game_selector.h"
 #include "../widgets/tabs/tab_room.h"
 #include "../widgets/tabs/tab_supervisor.h"
-#include "abstract_client.h"
-#include "contexts/context_connect_to_server.h"
-#include "contexts/context_join_room.h"
 #include "intent_join_server_room.h"
-#include "remote_client.h"
 
-#include <QMap>
-#include <QSharedPointer>
-#include <QString>
 #include <QTimer>
-#include <qnamespace.h>
 
 IntentJoinServerGame::IntentJoinServerGame(TabSupervisor *_tabSupervisor,
                                            RemoteClient *_remoteClient,
diff --git a/cockatrice/src/interface/intents/intent_join_server_game.h b/cockatrice/src/interface/intents/intent_join_server_game.h
index 5abb31fc5..5e196df38 100644
--- a/cockatrice/src/interface/intents/intent_join_server_game.h
+++ b/cockatrice/src/interface/intents/intent_join_server_game.h
@@ -3,14 +3,13 @@
 
 #include "contexts/context_join_game.h"
 #include "intent.h"
+#include "remote_client.h"
 
 #include <QScopedPointer>
 #include <memory>
-#include <qtmetamacros.h>
 
 class TabRoom;
 class TabSupervisor;
-class RemoteClient;
 
 class IntentJoinServerGame : public Intent
 {
diff --git a/cockatrice/src/interface/intents/intent_join_server_room.cpp b/cockatrice/src/interface/intents/intent_join_server_room.cpp
index 24349cadf..d25bc8d17 100644
--- a/cockatrice/src/interface/intents/intent_join_server_room.cpp
+++ b/cockatrice/src/interface/intents/intent_join_server_room.cpp
@@ -3,15 +3,8 @@
 #include "../widgets/tabs/tab_room.h"
 #include "../widgets/tabs/tab_server.h"
 #include "../widgets/tabs/tab_supervisor.h"
-#include "abstract_client.h"
-#include "contexts/context_connect_to_server.h"
-#include "contexts/context_join_room.h"
 #include "intent_connect_to_server.h"
-#include "remote_client.h"
 
-#include <QMap>
-#include <QSharedPointer>
-#include <QString>
 #include <QTimer>
 #include <libcockatrice/protocol/pb/serverinfo_room.pb.h>
 
diff --git a/cockatrice/src/interface/intents/intent_join_server_room.h b/cockatrice/src/interface/intents/intent_join_server_room.h
index b4febae7b..4a5599896 100644
--- a/cockatrice/src/interface/intents/intent_join_server_room.h
+++ b/cockatrice/src/interface/intents/intent_join_server_room.h
@@ -1,13 +1,11 @@
 #ifndef COCKATRICE_INTENT_JOIN_SERVER_ROOM_H
 #define COCKATRICE_INTENT_JOIN_SERVER_ROOM_H
 
+#include "contexts/context_join_room.h"
 #include "intent.h"
-
-#include <qtmetamacros.h>
+#include "remote_client.h"
 
 class TabSupervisor;
-class RemoteClient;
-struct ContextJoinRoom;
 
 class IntentJoinServerRoom : public Intent
 {
diff --git a/cockatrice/src/interface/intents/intent_login.cpp b/cockatrice/src/interface/intents/intent_login.cpp
index 0d8390015..7beb63e1d 100644
--- a/cockatrice/src/interface/intents/intent_login.cpp
+++ b/cockatrice/src/interface/intents/intent_login.cpp
@@ -2,13 +2,9 @@
 
 #include "../../client/settings/cache_settings.h"
 #include "../widgets/dialogs/dlg_login_prompt.h"
-#include "contexts/context_connect_to_server.h"
 #include "libcockatrice/settings/servers_settings.h"
 
 #include <QDialog>
-#include <QString>
-#include <QVariant>
-#include <qnamespace.h>
 
 IntentGetLoginCredentials::IntentGetLoginCredentials(ContextConnectToServer *_context,
                                                      bool _promptForMissingCredentials)
diff --git a/cockatrice/src/interface/intents/intent_login.h b/cockatrice/src/interface/intents/intent_login.h
index a805f1d75..8ffd91a0a 100644
--- a/cockatrice/src/interface/intents/intent_login.h
+++ b/cockatrice/src/interface/intents/intent_login.h
@@ -1,12 +1,9 @@
 #ifndef COCKATRICE_INTENT_LOGIN_H
 #define COCKATRICE_INTENT_LOGIN_H
 
+#include "contexts/context_connect_to_server.h"
 #include "intent.h"
 
-#include <qtmetamacros.h>
-
-struct ContextConnectToServer;
-
 class IntentGetLoginCredentials : public Intent
 {
     Q_OBJECT
diff --git a/cockatrice/src/interface/intents/intent_open_local_deck.cpp b/cockatrice/src/interface/intents/intent_open_local_deck.cpp
index 5b673d106..2457bec72 100644
--- a/cockatrice/src/interface/intents/intent_open_local_deck.cpp
+++ b/cockatrice/src/interface/intents/intent_open_local_deck.cpp
@@ -2,14 +2,10 @@
 
 #include "../deck_loader/deck_file_format.h"
 #include "../deck_loader/deck_loader.h"
-#include "../deck_loader/loaded_deck.h"
 #include "../widgets/tabs/tab_supervisor.h"
 #include "intent_wait_for_database_load.h"
-#include "libcockatrice/card/database/card_database.h"
-#include "libcockatrice/card/database/card_database_loader.h"
 
 #include <libcockatrice/card/database/card_database_manager.h>
-#include <optional>
 
 IntentOpenLocalDeck::IntentOpenLocalDeck(TabSupervisor *_tabSupervisor, const QString &_file)
     : Intent(), tabSupervisor(_tabSupervisor), file(_file)
diff --git a/cockatrice/src/interface/intents/intent_open_local_deck.h b/cockatrice/src/interface/intents/intent_open_local_deck.h
index 0338e9384..97f875e39 100644
--- a/cockatrice/src/interface/intents/intent_open_local_deck.h
+++ b/cockatrice/src/interface/intents/intent_open_local_deck.h
@@ -4,7 +4,6 @@
 #include "intent.h"
 
 #include <QString>
-#include <qtmetamacros.h>
 
 class TabSupervisor;
 
diff --git a/cockatrice/src/interface/intents/intent_open_server_room_by_name.cpp b/cockatrice/src/interface/intents/intent_open_server_room_by_name.cpp
index 63aef004b..d50f509a0 100644
--- a/cockatrice/src/interface/intents/intent_open_server_room_by_name.cpp
+++ b/cockatrice/src/interface/intents/intent_open_server_room_by_name.cpp
@@ -2,22 +2,13 @@
 
 #include "../widgets/tabs/tab_room.h"
 #include "../widgets/tabs/tab_supervisor.h"
-#include "contexts/context_connect_to_server.h"
 #include "intent_connect_to_server.h"
-#include "libcockatrice/protocol/pb/response.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_room.pb.h"
-#include "remote_client.h"
 
-#include <QMap>
-#include <QSharedPointer>
 #include <libcockatrice/protocol/pb/event_list_rooms.pb.h>
 #include <libcockatrice/protocol/pb/response_join_room.pb.h>
 #include <libcockatrice/protocol/pb/session_commands.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
 
-class CommandContainer;
-class QVariant;
-
 IntentOpenServerRoomByName::IntentOpenServerRoomByName(TabSupervisor *_tabSupervisor,
                                                        RemoteClient *_remoteClient,
                                                        std::unique_ptr<ContextJoinRoom> _context,
diff --git a/cockatrice/src/interface/intents/intent_open_server_room_by_name.h b/cockatrice/src/interface/intents/intent_open_server_room_by_name.h
index e163796fc..2f9e716af 100644
--- a/cockatrice/src/interface/intents/intent_open_server_room_by_name.h
+++ b/cockatrice/src/interface/intents/intent_open_server_room_by_name.h
@@ -1,21 +1,19 @@
 #ifndef COCKATRICE_INTENT_OPEN_SERVER_ROOM_BY_NAME_H
 #define COCKATRICE_INTENT_OPEN_SERVER_ROOM_BY_NAME_H
 
-#include "abstract_client.h"
 #include "contexts/context_join_room.h"
 #include "intent.h"
+#include "remote_client.h"
 
 #include <QScopedPointer>
 #include <QString>
 #include <QTimer>
 #include <memory>
-#include <qtmetamacros.h>
 
+class TabRoom;
 class TabSupervisor;
 class Event_ListRooms;
 class ServerInfo_Room;
-class RemoteClient;
-class Response;
 
 /**
  * @brief Connects to the configured server and opens a room identified by its name.
diff --git a/cockatrice/src/interface/intents/intent_open_shared_deck.cpp b/cockatrice/src/interface/intents/intent_open_shared_deck.cpp
index 8abad3d88..016de63e6 100644
--- a/cockatrice/src/interface/intents/intent_open_shared_deck.cpp
+++ b/cockatrice/src/interface/intents/intent_open_shared_deck.cpp
@@ -3,17 +3,11 @@
 #include "../deck_loader/deck_loader.h"
 #include "../widgets/dialogs/dlg_shared_decks_preview.h"
 #include "../widgets/tabs/tab_supervisor.h"
-#include "abstract_client.h"
-#include "contexts/context_connect_to_server.h"
 #include "intent_connect_to_server.h"
-#include "remote_client.h"
 
-#include <QDebug>
 #include <QMessageBox>
-#include <QSharedPointer>
 #include <QTimer>
-#include <QWidget>
-#include <google/protobuf/repeated_ptr_field.h>
+#include <libcockatrice/card/database/card_database_querier.h>
 #include <libcockatrice/protocol/pb/command_deck_share_download.pb.h>
 #include <libcockatrice/protocol/pb/command_deck_share_list.pb.h>
 #include <libcockatrice/protocol/pb/response.pb.h>
@@ -21,11 +15,6 @@
 #include <libcockatrice/protocol/pb/response_deck_share_list.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_deck_share_item.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
-#include <optional>
-#include <qnamespace.h>
-#include <string>
-
-class CommandContainer;
 
 IntentOpenSharedDeck::IntentOpenSharedDeck(TabSupervisor *_tabSupervisor,
                                            RemoteClient *_remoteClient,
diff --git a/cockatrice/src/interface/intents/intent_open_shared_deck.h b/cockatrice/src/interface/intents/intent_open_shared_deck.h
index afce2370f..87812bdea 100644
--- a/cockatrice/src/interface/intents/intent_open_shared_deck.h
+++ b/cockatrice/src/interface/intents/intent_open_shared_deck.h
@@ -1,24 +1,20 @@
 #ifndef COCKATRICE_INTENT_OPEN_SHARED_DECK_H
 #define COCKATRICE_INTENT_OPEN_SHARED_DECK_H
 
-#include "../deck_loader/loaded_deck.h"
 #include "contexts/context_open_deck.h"
 #include "intent.h"
+#include "remote_client.h"
 
 #include <QList>
 #include <QMap>
 #include <QScopedPointer>
-#include <QString>
 #include <memory>
-#include <qtmetamacros.h>
 
 class TabSupervisor;
+struct LoadedDeck;
 class CardDatabaseQuerier;
 class DlgSharedDecksPreview;
 class QTimer;
-class CommandContainer;
-class RemoteClient;
-class Response;
 
 class IntentOpenSharedDeck : public Intent
 {
diff --git a/cockatrice/src/interface/intents/intent_wait_for_database_load.cpp b/cockatrice/src/interface/intents/intent_wait_for_database_load.cpp
index 7a7da90a4..c36378818 100644
--- a/cockatrice/src/interface/intents/intent_wait_for_database_load.cpp
+++ b/cockatrice/src/interface/intents/intent_wait_for_database_load.cpp
@@ -1,8 +1,5 @@
 #include "intent_wait_for_database_load.h"
 
-#include "libcockatrice/card/database/card_database.h"
-#include "libcockatrice/card/database/card_database_loader.h"
-
 #include <libcockatrice/card/database/card_database_manager.h>
 
 bool IntentWaitForDatabaseLoad::checkPrecondition() const
diff --git a/cockatrice/src/interface/intents/intent_wait_for_database_load.h b/cockatrice/src/interface/intents/intent_wait_for_database_load.h
index 715918f04..72f4a1ffc 100644
--- a/cockatrice/src/interface/intents/intent_wait_for_database_load.h
+++ b/cockatrice/src/interface/intents/intent_wait_for_database_load.h
@@ -3,8 +3,6 @@
 
 #include "intent.h"
 
-#include <qtmetamacros.h>
-
 class IntentWaitForDatabaseLoad : public Intent
 {
     Q_OBJECT
diff --git a/cockatrice/src/interface/intents/url_parser.cpp b/cockatrice/src/interface/intents/url_parser.cpp
index 966fd1213..707863354 100644
--- a/cockatrice/src/interface/intents/url_parser.cpp
+++ b/cockatrice/src/interface/intents/url_parser.cpp
@@ -4,34 +4,22 @@
 #include "../widgets/tabs/tab_room.h"
 #include "../widgets/tabs/tab_supervisor.h"
 #include "../window_main.h"
-#include "contexts/context_connect_to_server.h"
 #include "contexts/context_join_game.h"
-#include "contexts/context_join_room.h"
 #include "contexts/context_open_deck.h"
 #include "intent.h"
 #include "intent_join_server_game.h"
 #include "intent_login.h"
 #include "intent_open_shared_deck.h"
-#include "remote_client.h"
 
 #include <QDebug>
 #include <QLoggingCategory>
-#include <QMap>
 #include <QMessageBox>
-#include <QMessageLogger>
-#include <QSharedPointer>
-#include <QStringLiteral>
 #include <QUrl>
 #include <QUrlQuery>
-#include <QVariant>
-#include <QtGlobal>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/settings/servers_settings.h>
 #include <memory>
-#include <qlogging.h>
-#include <qnamespace.h>
-#include <utility>
 
 inline Q_LOGGING_CATEGORY(UrlParserLog, "url_parser");
 
diff --git a/cockatrice/src/interface/intents/url_parser.h b/cockatrice/src/interface/intents/url_parser.h
index 9b8594275..ea29fed53 100644
--- a/cockatrice/src/interface/intents/url_parser.h
+++ b/cockatrice/src/interface/intents/url_parser.h
@@ -2,11 +2,8 @@
 #define COCKATRICE_URL_PARSER_H
 
 #include <QList>
-#include <QMetaObject>
 #include <QObject>
-#include <QString>
 #include <QUrlQuery>
-#include <qtmetamacros.h>
 
 class Intent;
 class MainWindow;
diff --git a/cockatrice/src/interface/key_signals.cpp b/cockatrice/src/interface/key_signals.cpp
index 4c3074139..a78997cc2 100644
--- a/cockatrice/src/interface/key_signals.cpp
+++ b/cockatrice/src/interface/key_signals.cpp
@@ -1,9 +1,6 @@
 #include "key_signals.h"
 
-#include <QEvent>
-#include <QFlags>
 #include <QKeyEvent>
-#include <qnamespace.h>
 
 bool KeySignals::eventFilter(QObject * /*object*/, QEvent *event)
 {
diff --git a/cockatrice/src/interface/key_signals.h b/cockatrice/src/interface/key_signals.h
index dbe147ad8..30dcee0ba 100644
--- a/cockatrice/src/interface/key_signals.h
+++ b/cockatrice/src/interface/key_signals.h
@@ -8,8 +8,8 @@
 #ifndef KEYSIGNALS_H
 #define KEYSIGNALS_H
 
+#include <QEvent>
 #include <QObject>
-#include <qtmetamacros.h>
 
 class KeySignals : public QObject
 {
diff --git a/cockatrice/src/interface/layouts/flow_layout.cpp b/cockatrice/src/interface/layouts/flow_layout.cpp
index ba5e492e3..0d03b7789 100644
--- a/cockatrice/src/interface/layouts/flow_layout.cpp
+++ b/cockatrice/src/interface/layouts/flow_layout.cpp
@@ -15,18 +15,13 @@
 
 #include "flow_layout.h"
 
+#include "../widgets/general/layout_containers/flow_widget.h"
+
 #include <QDebug>
 #include <QLayoutItem>
-#include <QMessageLogger>
-#include <QMetaObject>
-#include <QObject>
-#include <QPoint>
-#include <QRect>
-#include <QSizePolicy>
+#include <QScrollArea>
 #include <QStyle>
-#include <QWidget>
 #include <QWidgetItem>
-#include <QtGlobal>
 
 FlowLayout::FlowLayout(QWidget *parent,
                        const Qt::Orientation flowDirection,
diff --git a/cockatrice/src/interface/layouts/flow_layout.h b/cockatrice/src/interface/layouts/flow_layout.h
index a6e015e3e..9adcd8bb5 100644
--- a/cockatrice/src/interface/layouts/flow_layout.h
+++ b/cockatrice/src/interface/layouts/flow_layout.h
@@ -12,14 +12,8 @@
 #include <QLayout>
 #include <QList>
 #include <QLoggingCategory>
-#include <QSize>
 #include <QStyle>
-#include <QVector>
-#include <qlogging.h>
-#include <qnamespace.h>
-
-class QLayoutItem;
-class QWidget;
+#include <QWidget>
 
 inline Q_LOGGING_CATEGORY(FlowLayoutLog, "flow_layout", QtInfoMsg);
 
diff --git a/cockatrice/src/interface/layouts/overlap_layout.cpp b/cockatrice/src/interface/layouts/overlap_layout.cpp
index 2b4da9138..a4c13518a 100644
--- a/cockatrice/src/interface/layouts/overlap_layout.cpp
+++ b/cockatrice/src/interface/layouts/overlap_layout.cpp
@@ -1,15 +1,7 @@
 #include "overlap_layout.h"
 
 #include <QDebug>
-#include <QLayoutItem>
-#include <QMargins>
-#include <QMessageLogger>
-#include <QRect>
-#include <QWidget>
-#include <QWidgetItem>
-#include <QtGlobal>
 #include <QtMath>
-#include <limits.h>
 
 /**
  * @class OverlapLayout
diff --git a/cockatrice/src/interface/layouts/overlap_layout.h b/cockatrice/src/interface/layouts/overlap_layout.h
index 32c74c18a..c1b6a8e51 100644
--- a/cockatrice/src/interface/layouts/overlap_layout.h
+++ b/cockatrice/src/interface/layouts/overlap_layout.h
@@ -10,11 +10,7 @@
 #include <QLayout>
 #include <QList>
 #include <QLoggingCategory>
-#include <QSize>
-#include <qnamespace.h>
-
-class QLayoutItem;
-class QWidget;
+#include <QWidget>
 
 inline Q_LOGGING_CATEGORY(OverlapLayoutLog, "overlap_layout");
 
diff --git a/cockatrice/src/interface/logger.cpp b/cockatrice/src/interface/logger.cpp
index 87fdcbd8c..3e00a0b24 100644
--- a/cockatrice/src/interface/logger.cpp
+++ b/cockatrice/src/interface/logger.cpp
@@ -5,16 +5,9 @@
 #include <QApplication>
 #include <QDateTime>
 #include <QDebug>
-#include <QFlags>
-#include <QIODevice>
 #include <QLocale>
-#include <QMetaObject>
-#include <QMetaType>
-#include <QMutexLocker>
 #include <QSysInfo>
 #include <iostream>
-#include <qconfig.h>
-#include <qnamespace.h>
 
 #define LOGGER_MAX_ENTRIES 128
 #define LOGGER_FILENAME "qdebug.txt"
diff --git a/cockatrice/src/interface/logger.h b/cockatrice/src/interface/logger.h
index 2287da804..fc6dd70be 100644
--- a/cockatrice/src/interface/logger.h
+++ b/cockatrice/src/interface/logger.h
@@ -8,15 +8,10 @@
 #define LOGGER_H
 
 #include <QFile>
-#include <QList>
 #include <QMutex>
-#include <QObject>
 #include <QString>
 #include <QTextStream>
-#include <qlogging.h>
-#include <qprocessordetection.h>
-#include <qtmetamacros.h>
-#include <string>
+#include <QVector>
 
 #if defined(Q_PROCESSOR_X86_32)
 #define BUILD_ARCHITECTURE "32-bit"
diff --git a/cockatrice/src/interface/palette_editor/color_button.cpp b/cockatrice/src/interface/palette_editor/color_button.cpp
index a7db23d31..e1a490d20 100644
--- a/cockatrice/src/interface/palette_editor/color_button.cpp
+++ b/cockatrice/src/interface/palette_editor/color_button.cpp
@@ -1,19 +1,7 @@
 #include "color_button.h"
 
-#include <QBrush>
 #include <QColorDialog>
-#include <QFont>
-#include <QIcon>
 #include <QPainter>
-#include <QPalette>
-#include <QPen>
-#include <QPixmap>
-#include <QRectF>
-#include <QSize>
-#include <QString>
-#include <qnamespace.h>
-
-class QWidget;
 
 ColorButton::ColorButton(QWidget *parent) : QToolButton(parent)
 {
diff --git a/cockatrice/src/interface/palette_editor/color_button.h b/cockatrice/src/interface/palette_editor/color_button.h
index f9991ec6b..4b139ef68 100644
--- a/cockatrice/src/interface/palette_editor/color_button.h
+++ b/cockatrice/src/interface/palette_editor/color_button.h
@@ -3,9 +3,6 @@
 
 #include <QColor>
 #include <QToolButton>
-#include <qtmetamacros.h>
-
-class QWidget;
 
 class ColorButton : public QToolButton
 {
diff --git a/cockatrice/src/interface/palette_editor/palette_editor_dialog.cpp b/cockatrice/src/interface/palette_editor/palette_editor_dialog.cpp
index 20e16614a..d5a168708 100644
--- a/cockatrice/src/interface/palette_editor/palette_editor_dialog.cpp
+++ b/cockatrice/src/interface/palette_editor/palette_editor_dialog.cpp
@@ -1,6 +1,5 @@
 #include "palette_editor_dialog.h"
 
-#include "../theme_config.h"
 #include "../theme_manager.h"
 #include "palette_generator.h"
 #include "palette_grid_widget.h"
@@ -10,22 +9,12 @@
 #include <QComboBox>
 #include <QDialogButtonBox>
 #include <QDir>
-#include <QEvent>
 #include <QFile>
 #include <QFrame>
-#include <QHBoxLayout>
 #include <QLabel>
-#include <QList>
 #include <QMessageBox>
-#include <QPalette>
 #include <QPushButton>
-#include <QSharedPointer>
-#include <QStringList>
 #include <QTimer>
-#include <QVBoxLayout>
-#include <QWidget>
-#include <initializer_list>
-#include <qnamespace.h>
 
 PaletteEditorDialog::PaletteEditorDialog(const QString &_themeDirPath, const QString &_themeName, QWidget *parent)
     : QDialog(parent), themeDirPath(_themeDirPath), themeName(_themeName)
diff --git a/cockatrice/src/interface/palette_editor/palette_editor_dialog.h b/cockatrice/src/interface/palette_editor/palette_editor_dialog.h
index e29a70cb0..953902c06 100644
--- a/cockatrice/src/interface/palette_editor/palette_editor_dialog.h
+++ b/cockatrice/src/interface/palette_editor/palette_editor_dialog.h
@@ -3,21 +3,18 @@
 
 #include "../theme_config.h"
 
-#include <QColor>
 #include <QDialog>
+#include <QFrame>
 #include <QMap>
-#include <QString>
-#include <qtmetamacros.h>
 
 class QTimer;
+
 class QLabel;
 class QComboBox;
 class QDialogButtonBox;
 class QPushButton;
 class PaletteGridWidget;
 class QuickSetupPanel;
-class QFrame;
-class QWidget;
 
 class PaletteEditorDialog : public QDialog
 {
diff --git a/cockatrice/src/interface/palette_editor/palette_generator.cpp b/cockatrice/src/interface/palette_editor/palette_generator.cpp
index c98dcbe03..822e57250 100644
--- a/cockatrice/src/interface/palette_editor/palette_generator.cpp
+++ b/cockatrice/src/interface/palette_editor/palette_generator.cpp
@@ -1,13 +1,6 @@
 #include "palette_generator.h"
 
-#include "../theme_config.h"
-
 #include <QColor>
-#include <QMap>
-#include <QPalette>
-#include <QtGlobal>
-#include <qnamespace.h>
-#include <qnumeric.h>
 
 // ════════════════════════════════════════════════════════════════════════════
 //  PaletteGenerator::fromAccent
diff --git a/cockatrice/src/interface/palette_editor/palette_grid_widget.cpp b/cockatrice/src/interface/palette_editor/palette_grid_widget.cpp
index de069bc80..97d28b731 100644
--- a/cockatrice/src/interface/palette_editor/palette_grid_widget.cpp
+++ b/cockatrice/src/interface/palette_editor/palette_grid_widget.cpp
@@ -1,25 +1,14 @@
 #include "palette_grid_widget.h"
 
-#include "../theme_config.h"
 #include "../theme_manager.h"
-#include "color_button.h"
 
 #include <QApplication>
-#include <QColor>
-#include <QEvent>
-#include <QFont>
-#include <QFrame>
 #include <QGridLayout>
 #include <QLabel>
 #include <QMetaEnum>
 #include <QScrollArea>
-#include <QString>
-#include <QStringList>
 #include <QTimer>
 #include <QVBoxLayout>
-#include <QtGlobal>
-#include <qnamespace.h>
-#include <utility>
 
 static QList<QPalette::ColorRole> allRoles()
 {
diff --git a/cockatrice/src/interface/palette_editor/palette_grid_widget.h b/cockatrice/src/interface/palette_editor/palette_grid_widget.h
index f1ff41ec2..77cbf1c62 100644
--- a/cockatrice/src/interface/palette_editor/palette_grid_widget.h
+++ b/cockatrice/src/interface/palette_editor/palette_grid_widget.h
@@ -2,19 +2,15 @@
 #define COCKATRICE_PALETTE_GRID_WIDGET_H
 
 #include "../theme_config.h"
+#include "color_button.h"
 
-#include <QList>
 #include <QMap>
 #include <QPalette>
-#include <QVector>
+#include <QVBoxLayout>
 #include <QWidget>
-#include <qtmetamacros.h>
 
 class QLabel;
 class QScrollArea;
-class ColorButton;
-class QVBoxLayout;
-
 // Scrollable grid of ColorButtons — one per (ColorGroup × ColorRole) cell.
 // Owns the load/read round-trip for PaletteConfig but has no file I/O itself.
 class PaletteGridWidget : public QWidget
diff --git a/cockatrice/src/interface/palette_editor/quick_setup_panel.cpp b/cockatrice/src/interface/palette_editor/quick_setup_panel.cpp
index 04f98dcc3..85098bde5 100644
--- a/cockatrice/src/interface/palette_editor/quick_setup_panel.cpp
+++ b/cockatrice/src/interface/palette_editor/quick_setup_panel.cpp
@@ -1,15 +1,9 @@
 #include "quick_setup_panel.h"
 
-#include "color_button.h"
-
 #include <QApplication>
-#include <QFont>
 #include <QHBoxLayout>
 #include <QLabel>
-#include <QPalette>
 #include <QSlider>
-#include <QString>
-#include <qnamespace.h>
 
 QuickSetupPanel::QuickSetupPanel(QWidget *parent) : QWidget(parent)
 {
diff --git a/cockatrice/src/interface/palette_editor/quick_setup_panel.h b/cockatrice/src/interface/palette_editor/quick_setup_panel.h
index ea402086f..c83e27cf2 100644
--- a/cockatrice/src/interface/palette_editor/quick_setup_panel.h
+++ b/cockatrice/src/interface/palette_editor/quick_setup_panel.h
@@ -1,14 +1,13 @@
 #ifndef COCKATRICE_QUICK_SETUP_PANEL_H
 #define COCKATRICE_QUICK_SETUP_PANEL_H
 
-#include <QColor>
+#include "color_button.h"
+
 #include <QWidget>
-#include <qtmetamacros.h>
 
 class QHBoxLayout;
 class QLabel;
 class QSlider;
-class ColorButton;
 
 /**
  * @class QuickSetupPanel
diff --git a/cockatrice/src/interface/pixel_map_generator.cpp b/cockatrice/src/interface/pixel_map_generator.cpp
index 2f5c4b6dd..b70dc576f 100644
--- a/cockatrice/src/interface/pixel_map_generator.cpp
+++ b/cockatrice/src/interface/pixel_map_generator.cpp
@@ -1,37 +1,15 @@
 #include "pixel_map_generator.h"
 
-#include "libcockatrice/network/server/remote/user_level.h"
 #include "theme_manager.h"
 
 #include <QApplication>
-#include <QBrush>
-#include <QByteArray>
-#include <QChar>
-#include <QColor>
-#include <QDebug>
 #include <QDomDocument>
-#include <QDomElement>
-#include <QDomNode>
-#include <QDomNodeList>
 #include <QFile>
-#include <QIODevice>
-#include <QImage>
 #include <QImageReader>
-#include <QLatin1Char>
-#include <QLatin1String>
-#include <QMessageLogger>
 #include <QPainter>
 #include <QPalette>
-#include <QPointF>
-#include <QRadialGradient>
-#include <QSharedPointer>
-#include <QSize>
-#include <QStringLiteral>
 #include <QSvgRenderer>
-#include <QtGlobal>
-#include <initializer_list>
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
-#include <qnamespace.h>
 
 #define DEFAULT_COLOR_UNREGISTERED "#32c8ec";
 #define DEFAULT_COLOR_REGISTERED "#5ed900";
diff --git a/cockatrice/src/interface/pixel_map_generator.h b/cockatrice/src/interface/pixel_map_generator.h
index 7c01bb332..b6e822fd9 100644
--- a/cockatrice/src/interface/pixel_map_generator.h
+++ b/cockatrice/src/interface/pixel_map_generator.h
@@ -7,20 +7,14 @@
 #ifndef PIXMAPGENERATOR_H
 #define PIXMAPGENERATOR_H
 
-#include "libcockatrice/protocol/pb/serverinfo_user.pb.h"
-
 #include <QHash>
 #include <QIcon>
 #include <QLoggingCategory>
 #include <QMap>
 #include <QPixmap>
-#include <QString>
-#include <QStringView>
 #include <libcockatrice/network/server/remote/user_level.h>
 #include <optional>
 
-class QSize;
-
 inline Q_LOGGING_CATEGORY(PixelMapGeneratorLog, "pixel_map_generator");
 
 class PhasePixmapGenerator
diff --git a/cockatrice/src/interface/theme_config.cpp b/cockatrice/src/interface/theme_config.cpp
index 652e322c8..8293a82cf 100644
--- a/cockatrice/src/interface/theme_config.cpp
+++ b/cockatrice/src/interface/theme_config.cpp
@@ -1,17 +1,9 @@
 #include "theme_config.h"
 
-#include <QByteArray>
-#include <QChar>
 #include <QDir>
 #include <QFile>
-#include <QFlags>
-#include <QIODevice>
-#include <QList>
 #include <QMetaEnum>
-#include <QPair>
 #include <QTextStream>
-#include <qnamespace.h>
-#include <utility>
 
 bool ThemeConfig::isEmpty() const
 {
diff --git a/cockatrice/src/interface/theme_config.h b/cockatrice/src/interface/theme_config.h
index 8b91613f5..567aeccda 100644
--- a/cockatrice/src/interface/theme_config.h
+++ b/cockatrice/src/interface/theme_config.h
@@ -3,10 +3,9 @@
 
 #include <QColor>
 #include <QMap>
+#include <QObject>
 #include <QPalette>
-#include <QSharedPointer>
 #include <QString>
-#include <qtmetamacros.h>
 
 // Application-specific color roles, layered on top of the fixed QPalette role
 // set. Stored in the same palette-<scheme>.toml under an [AppColors] section
diff --git a/cockatrice/src/interface/theme_manager.cpp b/cockatrice/src/interface/theme_manager.cpp
index 9a96b3e45..08374c8fd 100644
--- a/cockatrice/src/interface/theme_manager.cpp
+++ b/cockatrice/src/interface/theme_manager.cpp
@@ -2,40 +2,25 @@
 
 #include "../../client/settings/cache_settings.h"
 #include "pixel_map_generator.h"
-#include "theme_config.h"
 
 #include <QApplication>
-#include <QChar>
 #include <QColor>
 #include <QDebug>
-#include <QDir>
 #include <QFile>
 #include <QFileInfo>
-#include <QFlags>
-#include <QGuiApplication>
-#include <QIODevice>
-#include <QLatin1Char>
-#include <QList>
+#include <QLibraryInfo>
 #include <QMap>
-#include <QMessageLogger>
 #include <QMetaEnum>
 #include <QPalette>
-#include <QPixmap>
 #include <QPixmapCache>
-#include <QSharedPointer>
+#include <QStandardPaths>
 #include <QString>
-#include <QStringList>
-#include <QStringLiteral>
 #include <QStyle>
 #include <QStyleFactory>
 #include <QStyleHints>
-#include <QTextStream>
 #include <QWidget>
 #include <Qt>
-#include <QtGlobal>
 #include <libcockatrice/settings/paths_settings.h>
-#include <qlogging.h>
-#include <qnumeric.h>
 
 #define SYSTEM_THEME_NAME "System"
 #define LEGACY_SYSTEM_THEME_NAME "Default"
@@ -111,17 +96,12 @@ struct PaletteColorInfo
 
 static QString usableDefaultStyle(const QString &style)
 {
-    // Only the OS/default ("System") style is sanitized: the Windows 11 and
-    // Windows Vista native styles are broken (dragging cards across zones can
+    // The Windows 11 native style is broken: dragging cards across zones can
     // shrink the board to a tiny grey window that is unfixable without
-    // rejoining), so a "System" choice falls through to the built-in "windows"
-    // style (QWindowsStyle) instead. They remain selectable by hand, where the
-    // settings page warns about them.
-    if (style.compare("windows11", Qt::CaseInsensitive) == 0 ||
-        style.compare("windowsvista", Qt::CaseInsensitive) == 0) {
-        return QStringLiteral("windows");
-    }
-    return style;
+    // rejoining. It is never usable, so guard against it no matter how it was
+    // requested (OS default or an explicit "windows11" theme choice) and fall
+    // back to the Vista style.
+    return style.compare("windows11", Qt::CaseInsensitive) == 0 ? QStringLiteral("windowsvista") : style;
 }
 
 ThemeManager::ThemeManager(QObject *parent) : QObject(parent)
@@ -501,13 +481,14 @@ void ThemeManager::applyStyleAndPalette(const QString &themeName,
         if (themeName == FUSION_THEME_NAME) {
             styleName = "Fusion";
         } else {
-            // "System" resolves through the guard, which steers the broken
-            // Windows native styles to "windows". An explicitly chosen style
-            // name is honored as-is.
             styleName = usableDefaultStyle(defaultStyleName);
         }
     }
 
+    // The Windows 11 style is broken even when selected explicitly in a theme,
+    // so sanitize the resolved name here rather than trusting the theme config.
+    styleName = usableDefaultStyle(styleName);
+
     QStyle *style = QStyleFactory::create(styleName);
     if (!style) {
         style = QStyleFactory::create(usableDefaultStyle(defaultStyleName));
diff --git a/cockatrice/src/interface/theme_manager.h b/cockatrice/src/interface/theme_manager.h
index c1ab65685..4c9d070dc 100644
--- a/cockatrice/src/interface/theme_manager.h
+++ b/cockatrice/src/interface/theme_manager.h
@@ -10,21 +10,21 @@
 #include "theme_config.h"
 
 #include <QBrush>
-#include <QColor>
+#include <QDir>
 #include <QLoggingCategory>
 #include <QMap>
 #include <QObject>
-#include <QPalette>
+#include <QPixmap>
 #include <QString>
-#include <QStringView>
 #include <array>
-#include <qtmetamacros.h>
 
 inline Q_LOGGING_CATEGORY(ThemeManagerLog, "theme_manager");
 
 typedef QMap<QString, QString> QStringMap;
 typedef QMap<int, QBrush> QBrushMap;
 
+class QApplication;
+
 class ThemeManager : public QObject
 {
     Q_OBJECT
diff --git a/cockatrice/src/interface/widgets/cards/additional_info/color_identity_widget.cpp b/cockatrice/src/interface/widgets/cards/additional_info/color_identity_widget.cpp
index ef7fb0e0e..2199faf30 100644
--- a/cockatrice/src/interface/widgets/cards/additional_info/color_identity_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/additional_info/color_identity_widget.cpp
@@ -1,24 +1,15 @@
 #include "color_identity_widget.h"
 
 #include "../../../../client/settings/cache_settings.h"
-#include "libcockatrice/card/card_info.h"
 #include "mana_symbol_widget.h"
 
-#include <QChar>
 #include <QHBoxLayout>
-#include <QLayoutItem>
-#include <QList>
-#include <QObject>
+#include <QLabel>
 #include <QRegularExpression>
-#include <QRegularExpressionMatch>
-#include <QRegularExpressionMatchIterator>
 #include <QResizeEvent>
-#include <QSharedPointer>
 #include <QSize>
-#include <QtGlobal>
 #include <libcockatrice/settings/visual_deck_storage_settings.h>
 #include <libcockatrice/utility/qt_utils.h>
-#include <qnamespace.h>
 
 ColorIdentityWidget::ColorIdentityWidget(QWidget *parent, const QString &_colorIdentity)
     : QWidget(parent), colorIdentity(_colorIdentity)
diff --git a/cockatrice/src/interface/widgets/cards/additional_info/color_identity_widget.h b/cockatrice/src/interface/widgets/cards/additional_info/color_identity_widget.h
index 3caf1a964..315ac07d6 100644
--- a/cockatrice/src/interface/widgets/cards/additional_info/color_identity_widget.h
+++ b/cockatrice/src/interface/widgets/cards/additional_info/color_identity_widget.h
@@ -7,13 +7,9 @@
 #ifndef COLOR_IDENTITY_WIDGET_H
 #define COLOR_IDENTITY_WIDGET_H
 
-#include <QString>
-#include <QStringList>
+#include <QHBoxLayout>
 #include <QWidget>
 #include <libcockatrice/card/card_info.h>
-#include <qtmetamacros.h>
-
-class QHBoxLayout;
 
 class ColorIdentityWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/cards/additional_info/deck_color_identity.cpp b/cockatrice/src/interface/widgets/cards/additional_info/deck_color_identity.cpp
index 13c185a79..62b01511e 100644
--- a/cockatrice/src/interface/widgets/cards/additional_info/deck_color_identity.cpp
+++ b/cockatrice/src/interface/widgets/cards/additional_info/deck_color_identity.cpp
@@ -1,11 +1,6 @@
 #include "deck_color_identity.h"
 
-#include "libcockatrice/card/card_info.h"
-
-#include <QChar>
-#include <QList>
 #include <QSet>
-#include <QStringList>
 #include <libcockatrice/card/database/card_database_querier.h>
 #include <libcockatrice/deck_list/deck_list.h>
 #include <libcockatrice/deck_list/tree/inner_deck_list_node.h>
diff --git a/cockatrice/src/interface/widgets/cards/additional_info/mana_cost_widget.cpp b/cockatrice/src/interface/widgets/cards/additional_info/mana_cost_widget.cpp
index 7da97f88c..fcbb69c2e 100644
--- a/cockatrice/src/interface/widgets/cards/additional_info/mana_cost_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/additional_info/mana_cost_widget.cpp
@@ -1,16 +1,12 @@
 #include "mana_cost_widget.h"
 
-#include "libcockatrice/card/card_info.h"
 #include "mana_symbol_widget.h"
 
 #include <QHBoxLayout>
-#include <QList>
-#include <QRegularExpression>
-#include <QRegularExpressionMatch>
-#include <QRegularExpressionMatchIterator>
+#include <QLabel>
 #include <QResizeEvent>
 #include <QSize>
-#include <QtGlobal>
+#include <qregularexpression.h>
 
 ManaCostWidget::ManaCostWidget(QWidget *parent, CardInfoPtr _card) : QWidget(parent), card(_card)
 {
diff --git a/cockatrice/src/interface/widgets/cards/additional_info/mana_cost_widget.h b/cockatrice/src/interface/widgets/cards/additional_info/mana_cost_widget.h
index a181f1148..8bd2e9bc0 100644
--- a/cockatrice/src/interface/widgets/cards/additional_info/mana_cost_widget.h
+++ b/cockatrice/src/interface/widgets/cards/additional_info/mana_cost_widget.h
@@ -7,13 +7,9 @@
 #ifndef MANA_COST_WIDGET_H
 #define MANA_COST_WIDGET_H
 
-#include <QString>
-#include <QStringList>
+#include <QHBoxLayout>
 #include <QWidget>
 #include <libcockatrice/card/card_info.h>
-#include <qtmetamacros.h>
-
-class QHBoxLayout;
 
 class ManaCostWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/cards/additional_info/mana_symbol_widget.cpp b/cockatrice/src/interface/widgets/cards/additional_info/mana_symbol_widget.cpp
index 80dc11852..18011909f 100644
--- a/cockatrice/src/interface/widgets/cards/additional_info/mana_symbol_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/additional_info/mana_symbol_widget.cpp
@@ -3,16 +3,8 @@
 #include "../../../../client/settings/cache_settings.h"
 #include "../../../pixel_map_generator.h"
 
-#include <QGraphicsOpacityEffect>
-#include <QPixmap>
 #include <QResizeEvent>
-#include <QSharedPointer>
-#include <QSize>
-#include <QtGlobal>
 #include <libcockatrice/settings/visual_deck_storage_settings.h>
-#include <utility>
-
-class QWidget;
 
 ManaSymbolWidget::ManaSymbolWidget(QWidget *parent, QString _symbol, bool _isActive, bool _mayBeToggled)
     : QLabel(parent), symbol(std::move(_symbol)), isActive(_isActive), mayBeToggled(_mayBeToggled)
diff --git a/cockatrice/src/interface/widgets/cards/additional_info/mana_symbol_widget.h b/cockatrice/src/interface/widgets/cards/additional_info/mana_symbol_widget.h
index 8dad15785..705873dff 100644
--- a/cockatrice/src/interface/widgets/cards/additional_info/mana_symbol_widget.h
+++ b/cockatrice/src/interface/widgets/cards/additional_info/mana_symbol_widget.h
@@ -7,13 +7,8 @@
 #ifndef MANA_SYMBOL_WIDGET_H
 #define MANA_SYMBOL_WIDGET_H
 
-#include <QChar>
+#include <QGraphicsOpacityEffect>
 #include <QLabel>
-#include <QString>
-#include <qtmetamacros.h>
-
-class QGraphicsOpacityEffect;
-class QWidget;
 
 class ManaSymbolWidget : public QLabel
 {
diff --git a/cockatrice/src/interface/widgets/cards/art_crop_attribution.cpp b/cockatrice/src/interface/widgets/cards/art_crop_attribution.cpp
index c4b347047..8ab18ddd9 100644
--- a/cockatrice/src/interface/widgets/cards/art_crop_attribution.cpp
+++ b/cockatrice/src/interface/widgets/cards/art_crop_attribution.cpp
@@ -1,17 +1,8 @@
 #include "art_crop_attribution.h"
 
-#include "libcockatrice/card/printing/printing_info.h"
-
-#include <QColor>
-#include <QFont>
 #include <QFontMetrics>
 #include <QObject>
 #include <QPainter>
-#include <QPointF>
-#include <QRectF>
-#include <QSizeF>
-#include <QString>
-#include <QtGlobal>
 #include <libcockatrice/card/printing/exact_card.h>
 
 QString buildArtAttribution(const ExactCard &card)
diff --git a/cockatrice/src/interface/widgets/cards/art_crop_attribution.h b/cockatrice/src/interface/widgets/cards/art_crop_attribution.h
index b4acbef26..0b3fb3d56 100644
--- a/cockatrice/src/interface/widgets/cards/art_crop_attribution.h
+++ b/cockatrice/src/interface/widgets/cards/art_crop_attribution.h
@@ -1,8 +1,7 @@
 #ifndef COCKATRICE_ART_CROP_ATTRIBUTION_H
 #define COCKATRICE_ART_CROP_ATTRIBUTION_H
 
-#include <QtGlobal>
-#include <qnamespace.h>
+#include <QStringView>
 
 class ExactCard;
 class QPainter;
diff --git a/cockatrice/src/interface/widgets/cards/card_art_utils.cpp b/cockatrice/src/interface/widgets/cards/card_art_utils.cpp
index ebf79282e..b26b73593 100644
--- a/cockatrice/src/interface/widgets/cards/card_art_utils.cpp
+++ b/cockatrice/src/interface/widgets/cards/card_art_utils.cpp
@@ -1,10 +1,7 @@
 #include "card_art_utils.h"
 
-#include "libcockatrice/card/card_info.h"
-
 #include <QTransform>
 #include <libcockatrice/card/printing/exact_card.h>
-#include <qnamespace.h>
 
 namespace CardArtUtils
 {
diff --git a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp
index b15ac5d23..8df3700c3 100644
--- a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp
@@ -1,33 +1,13 @@
 #include "card_group_display_widget.h"
 
 #include "../../../../client/settings/cache_settings.h"
-#include "../../general/display/banner_widget.h"
-#include "../card_info_picture_widget.h"
 #include "../card_info_picture_with_text_overlay_widget.h"
-#include "../card_size_widget.h"
-#include "libcockatrice/card/database/card_database_querier.h"
-#include "libcockatrice/card/printing/exact_card.h"
 
-#include <QAbstractItemModel>
-#include <QAbstractProxyModel>
-#include <QDebug>
-#include <QItemSelection>
-#include <QItemSelectionModel>
-#include <QItemSelectionRange>
-#include <QModelIndex>
-#include <QObject>
-#include <QSharedPointer>
-#include <QSize>
-#include <QSlider>
-#include <QStringLiteral>
-#include <QVariant>
-#include <QtGlobal>
+#include <QResizeEvent>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/models/deck_list/deck_list_model.h>
 #include <libcockatrice/models/deck_list/deck_list_sort_filter_proxy_model.h>
 #include <libcockatrice/settings/cards_display_settings.h>
-#include <qnamespace.h>
-#include <utility>
 
 CardGroupDisplayWidget::CardGroupDisplayWidget(QWidget *parent,
                                                DeckListModel *_deckListModel,
diff --git a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.h b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.h
index f4a555766..e5f7c7ee2 100644
--- a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.h
+++ b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.h
@@ -7,24 +7,15 @@
 #ifndef CARD_GROUP_DISPLAY_WIDGET_H
 #define CARD_GROUP_DISPLAY_WIDGET_H
 
-#include <QList>
-#include <QMap>
-#include <QMouseEvent>
-#include <QPersistentModelIndex>
-#include <QString>
-#include <QStringList>
-#include <QVBoxLayout>
-#include <QVector>
-#include <QWidget>
-#include <qtmetamacros.h>
+#include "../../general/display/banner_widget.h"
+#include "../card_info_picture_with_text_overlay_widget.h"
+#include "../card_size_widget.h"
 
-class BannerWidget;
-class CardSizeWidget;
-class DeckListModel;
-class ExactCard;
-class QItemSelection;
-class QItemSelectionModel;
-class QModelIndex;
+#include <QItemSelectionModel>
+#include <QLabel>
+#include <QVBoxLayout>
+#include <QWidget>
+#include <libcockatrice/models/deck_list/deck_list_model.h>
 
 class CardGroupDisplayWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp
index 3256e0ca8..a192d13d8 100644
--- a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp
@@ -1,20 +1,10 @@
 #include "flat_card_group_display_widget.h"
 
-#include "../../general/display/banner_widget.h"
-#include "../../general/layout_containers/flow_widget.h"
-
-#include <QAbstractItemModel>
-#include <QList>
-#include <QMap>
-#include <QVBoxLayout>
-#include <QWidget>
+#include <QResizeEvent>
+#include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/models/deck_list/deck_list_model.h>
-#include <qnamespace.h>
 #include <utility>
 
-class CardSizeWidget;
-class QItemSelectionModel;
-
 FlatCardGroupDisplayWidget::FlatCardGroupDisplayWidget(QWidget *parent,
                                                        DeckListModel *_deckListModel,
                                                        QItemSelectionModel *_selectionModel,
diff --git a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.h b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.h
index d13dcddb5..0772c1ab4 100644
--- a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.h
+++ b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.h
@@ -10,16 +10,6 @@
 #include "../../general/layout_containers/flow_widget.h"
 #include "card_group_display_widget.h"
 
-#include <QPersistentModelIndex>
-#include <QString>
-#include <QStringList>
-#include <qtmetamacros.h>
-
-class CardSizeWidget;
-class DeckListModel;
-class QItemSelectionModel;
-class QWidget;
-
 class FlatCardGroupDisplayWidget : public CardGroupDisplayWidget
 {
     Q_OBJECT
diff --git a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.cpp b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.cpp
index 6e923cdbe..dca8ee2a5 100644
--- a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.cpp
@@ -1,20 +1,8 @@
 #include "overlapped_card_group_display_widget.h"
 
-#include "../../general/display/banner_widget.h"
-#include "../../general/layout_containers/overlap_widget.h"
-#include "../card_size_widget.h"
-
-#include <QAbstractItemModel>
-#include <QList>
-#include <QMap>
 #include <QResizeEvent>
-#include <QSlider>
-#include <QVBoxLayout>
-#include <QWidget>
+#include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/models/deck_list/deck_list_model.h>
-#include <qnamespace.h>
-
-class QItemSelectionModel;
 
 OverlappedCardGroupDisplayWidget::OverlappedCardGroupDisplayWidget(QWidget *parent,
                                                                    DeckListModel *_deckListModel,
diff --git a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.h b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.h
index 76be3069f..5b4b80d6b 100644
--- a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.h
+++ b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.h
@@ -10,16 +10,6 @@
 #include "../../general/layout_containers/overlap_widget.h"
 #include "card_group_display_widget.h"
 
-#include <QPersistentModelIndex>
-#include <QString>
-#include <QStringList>
-#include <qtmetamacros.h>
-
-class CardSizeWidget;
-class DeckListModel;
-class QItemSelectionModel;
-class QWidget;
-
 class OverlappedCardGroupDisplayWidget : public CardGroupDisplayWidget
 {
     Q_OBJECT
diff --git a/cockatrice/src/interface/widgets/cards/card_info_display_widget.cpp b/cockatrice/src/interface/widgets/cards/card_info_display_widget.cpp
index 7ec2ee38e..577dafe0a 100644
--- a/cockatrice/src/interface/widgets/cards/card_info_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/card_info_display_widget.cpp
@@ -1,25 +1,14 @@
 #include "card_info_display_widget.h"
 
-#include "../../../game_graphics/board/abstract_card_item.h"
-#include "../../../game_graphics/card_dimensions.h"
+#include "../../../game_graphics/board/card_item.h"
 #include "card_info_picture_widget.h"
 #include "card_info_text_widget.h"
-#include "libcockatrice/card/card_info.h"
-#include "libcockatrice/card/database/card_database_querier.h"
-#include "libcockatrice/card/printing/exact_card.h"
-#include "libcockatrice/utility/card_ref.h"
 
-#include <QGuiApplication>
-#include <QObject>
-#include <QRect>
+#include <QApplication>
 #include <QScreen>
-#include <QSize>
-#include <QString>
 #include <QVBoxLayout>
 #include <libcockatrice/card/database/card_database_manager.h>
 
-class QWidget;
-
 CardInfoDisplayWidget::CardInfoDisplayWidget(const CardRef &cardRef, QWidget *parent, Qt::WindowFlags flags)
     : QFrame(parent, flags), aspectRatio(CardDimensions::HEIGHT_F / CardDimensions::WIDTH_F)
 {
diff --git a/cockatrice/src/interface/widgets/cards/card_info_display_widget.h b/cockatrice/src/interface/widgets/cards/card_info_display_widget.h
index 65965a63e..f8f33f3d4 100644
--- a/cockatrice/src/interface/widgets/cards/card_info_display_widget.h
+++ b/cockatrice/src/interface/widgets/cards/card_info_display_widget.h
@@ -7,17 +7,15 @@
 #ifndef CARDINFOWIDGET_H
 #define CARDINFOWIDGET_H
 
+#include <QComboBox>
 #include <QFrame>
-#include <QtGlobal>
+#include <QStringList>
 #include <libcockatrice/card/printing/exact_card.h>
-#include <qnamespace.h>
-#include <qtmetamacros.h>
+#include <libcockatrice/utility/card_ref.h>
 
 class CardInfoPictureWidget;
 class CardInfoTextWidget;
 class AbstractCardItem;
-class QWidget;
-struct CardRef;
 
 class CardInfoDisplayWidget : public QFrame
 {
diff --git a/cockatrice/src/interface/widgets/cards/card_info_frame_widget.cpp b/cockatrice/src/interface/widgets/cards/card_info_frame_widget.cpp
index 0f66eb209..fcccf445a 100644
--- a/cockatrice/src/interface/widgets/cards/card_info_frame_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/card_info_frame_widget.cpp
@@ -1,27 +1,16 @@
 #include "card_info_frame_widget.h"
 
 #include "../../../client/settings/cache_settings.h"
-#include "../../../game_graphics/board/abstract_card_item.h"
+#include "../../../game_graphics/board/card_item.h"
+#include "card_info_display_widget.h"
 #include "card_info_picture_widget.h"
 #include "card_info_text_widget.h"
-#include "libcockatrice/card/card_info.h"
-#include "libcockatrice/card/database/card_database_querier.h"
-#include "libcockatrice/card/printing/exact_card.h"
 
-#include <QList>
-#include <QObject>
-#include <QPushButton>
 #include <QSplitter>
 #include <QVBoxLayout>
-#include <QWidget>
-#include <QtGlobal>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/card/relation/card_relation.h>
 #include <libcockatrice/settings/cards_display_settings.h>
-#include <libcockatrice/utility/card_ref.h>
-#include <qnamespace.h>
-
-struct CardRef;
 
 CardInfoFrameWidget::CardInfoFrameWidget(QWidget *parent)
     : QTabWidget(parent), viewTransformationButton(nullptr), cardTextOnly(false)
diff --git a/cockatrice/src/interface/widgets/cards/card_info_frame_widget.h b/cockatrice/src/interface/widgets/cards/card_info_frame_widget.h
index 1f8143785..e766fac7a 100644
--- a/cockatrice/src/interface/widgets/cards/card_info_frame_widget.h
+++ b/cockatrice/src/interface/widgets/cards/card_info_frame_widget.h
@@ -7,19 +7,16 @@
 #ifndef CARDFRAME_H
 #define CARDFRAME_H
 
-#include <QString>
+#include <QPushButton>
 #include <QTabWidget>
 #include <libcockatrice/card/printing/exact_card.h>
-#include <qtmetamacros.h>
+#include <libcockatrice/utility/card_ref.h>
 
 class AbstractCardItem;
 class CardInfoPictureWidget;
 class CardInfoTextWidget;
 class QVBoxLayout;
 class QSplitter;
-class QPushButton;
-class QWidget;
-struct CardRef;
 
 class CardInfoFrameWidget : public QTabWidget
 {
diff --git a/cockatrice/src/interface/widgets/cards/card_info_picture_art_crop_widget.cpp b/cockatrice/src/interface/widgets/cards/card_info_picture_art_crop_widget.cpp
index 5ec4c8a25..e5b0c4872 100644
--- a/cockatrice/src/interface/widgets/cards/card_info_picture_art_crop_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/card_info_picture_art_crop_widget.cpp
@@ -1,12 +1,6 @@
 #include "card_info_picture_art_crop_widget.h"
 
 #include "../../../interface/card_picture_loader/card_picture_loader.h"
-#include "libcockatrice/card/printing/exact_card.h"
-
-#include <QRect>
-#include <QSize>
-
-class QWidget;
 
 CardInfoPictureArtCropWidget::CardInfoPictureArtCropWidget(QWidget *parent)
     : CardInfoPictureWidget(parent, false, false)
diff --git a/cockatrice/src/interface/widgets/cards/card_info_picture_art_crop_widget.h b/cockatrice/src/interface/widgets/cards/card_info_picture_art_crop_widget.h
index 540b0c2fa..ce22a1a44 100644
--- a/cockatrice/src/interface/widgets/cards/card_info_picture_art_crop_widget.h
+++ b/cockatrice/src/interface/widgets/cards/card_info_picture_art_crop_widget.h
@@ -9,11 +9,6 @@
 
 #include "card_info_picture_widget.h"
 
-#include <QPixmap>
-#include <qtmetamacros.h>
-
-class QWidget;
-
 class CardInfoPictureArtCropWidget : public CardInfoPictureWidget
 {
     Q_OBJECT
diff --git a/cockatrice/src/interface/widgets/cards/card_info_picture_enlarged_widget.cpp b/cockatrice/src/interface/widgets/cards/card_info_picture_enlarged_widget.cpp
index ba10d4a0f..40bef3df3 100644
--- a/cockatrice/src/interface/widgets/cards/card_info_picture_enlarged_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/card_info_picture_enlarged_widget.cpp
@@ -2,17 +2,10 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../../interface/card_picture_loader/card_picture_loader.h"
-#include "libcockatrice/card/card_info.h"
-#include "libcockatrice/card/printing/exact_card.h"
 
 #include <QPainterPath>
-#include <QPoint>
-#include <QRect>
-#include <QSize>
 #include <QStylePainter>
-#include <QtGlobal>
 #include <libcockatrice/settings/cards_display_settings.h>
-#include <qnamespace.h>
 
 /**
  * @brief Constructs a CardPictureEnlargedWidget.
diff --git a/cockatrice/src/interface/widgets/cards/card_info_picture_enlarged_widget.h b/cockatrice/src/interface/widgets/cards/card_info_picture_enlarged_widget.h
index f5ead2a18..a158ac6cf 100644
--- a/cockatrice/src/interface/widgets/cards/card_info_picture_enlarged_widget.h
+++ b/cockatrice/src/interface/widgets/cards/card_info_picture_enlarged_widget.h
@@ -8,12 +8,8 @@
 #ifndef CARD_PICTURE_ENLARGED_WIDGET_H
 #define CARD_PICTURE_ENLARGED_WIDGET_H
 
-#include <QPixmap>
 #include <QWidget>
 #include <libcockatrice/card/printing/exact_card.h>
-#include <qtmetamacros.h>
-
-class QSize;
 
 class CardInfoPictureEnlargedWidget final : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp b/cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp
index 3c1e1b77f..2dd21e78a 100644
--- a/cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp
@@ -1,47 +1,21 @@
 #include "card_info_picture_widget.h"
 
 #include "../../../client/settings/cache_settings.h"
+#include "../../../game_graphics/board/card_item.h"
 #include "../../../interface/card_picture_loader/card_picture_loader.h"
 #include "../../../interface/widgets/tabs/tab_supervisor.h"
 #include "../../window_main.h"
-#include "../tabs/abstract_tab_deck_editor.h"
 #include "card_art_utils.h"
-#include "card_info_picture_enlarged_widget.h"
-#include "libcockatrice/card/card_info.h"
-#include "libcockatrice/card/database/card_database_querier.h"
-#include "libcockatrice/card/printing/exact_card.h"
-#include "libcockatrice/card/printing/printing_info.h"
-#include "libcockatrice/deck_list/tree/inner_deck_list_node.h"
 
-#include <QAbstractAnimation>
-#include <QAction>
-#include <QApplication>
-#include <QByteArray>
-#include <QCursor>
-#include <QDebug>
-#include <QEasingCurve>
-#include <QGuiApplication>
-#include <QList>
 #include <QMenu>
 #include <QMouseEvent>
-#include <QObject>
-#include <QPainterPath>
-#include <QPropertyAnimation>
-#include <QRect>
 #include <QScreen>
-#include <QSharedPointer>
-#include <QSize>
-#include <QString>
 #include <QStylePainter>
-#include <QTimer>
 #include <QWidget>
-#include <QtGlobal>
-#include <algorithm>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/card/relation/card_relation.h>
 #include <libcockatrice/settings/cards_display_settings.h>
-#include <qlogging.h>
-#include <qnamespace.h>
+#include <utility>
 
 static constexpr qreal MTG_CARD_ASPECT_RATIO = 1.396;
 // static constexpr qreal YUGIOH_CARD_ASPECT_RATIO = 1.457;
diff --git a/cockatrice/src/interface/widgets/cards/card_info_picture_widget.h b/cockatrice/src/interface/widgets/cards/card_info_picture_widget.h
index 8d2d63736..4fe84ed0b 100644
--- a/cockatrice/src/interface/widgets/cards/card_info_picture_widget.h
+++ b/cockatrice/src/interface/widgets/cards/card_info_picture_widget.h
@@ -7,20 +7,15 @@
 #ifndef CARD_INFO_PICTURE_H
 #define CARD_INFO_PICTURE_H
 
-#include <QLoggingCategory>
-#include <QMouseEvent>
-#include <QPixmap>
-#include <QPoint>
+#include "card_info_picture_enlarged_widget.h"
+
+#include <QPropertyAnimation>
 #include <QWidget>
 #include <libcockatrice/card/printing/exact_card.h>
-#include <qtmetamacros.h>
-
-class CardInfoPictureEnlargedWidget;
-class QPropertyAnimation;
-class QTimer;
 
 inline Q_LOGGING_CATEGORY(CardInfoPictureWidgetLog, "card_info_picture_widget");
 
+class AbstractCardItem;
 class QMenu;
 
 class CardInfoPictureWidget : public QWidget
diff --git a/cockatrice/src/interface/widgets/cards/card_info_picture_with_text_overlay_widget.cpp b/cockatrice/src/interface/widgets/cards/card_info_picture_with_text_overlay_widget.cpp
index 04fe9ab69..000a88b2f 100644
--- a/cockatrice/src/interface/widgets/cards/card_info_picture_with_text_overlay_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/card_info_picture_with_text_overlay_widget.cpp
@@ -1,24 +1,8 @@
 #include "card_info_picture_with_text_overlay_widget.h"
 
-#include <QBrush>
-#include <QChar>
-#include <QFont>
 #include <QFontMetrics>
-#include <QList>
-#include <QPainter>
 #include <QPainterPath>
-#include <QPalette>
-#include <QPen>
-#include <QPixmap>
-#include <QPoint>
-#include <QRect>
-#include <QSize>
-#include <QSizePolicy>
-#include <QStringList>
 #include <QStylePainter>
-#include <algorithm>
-
-class QWidget;
 
 /**
  * @brief Constructs a CardPictureWithTextOverlay widget.
diff --git a/cockatrice/src/interface/widgets/cards/card_info_picture_with_text_overlay_widget.h b/cockatrice/src/interface/widgets/cards/card_info_picture_with_text_overlay_widget.h
index 6c547dc13..ba978498d 100644
--- a/cockatrice/src/interface/widgets/cards/card_info_picture_with_text_overlay_widget.h
+++ b/cockatrice/src/interface/widgets/cards/card_info_picture_with_text_overlay_widget.h
@@ -11,14 +11,8 @@
 #include "card_info_picture_widget.h"
 
 #include <QColor>
-#include <QString>
+#include <QSize>
 #include <QTextOption>
-#include <qnamespace.h>
-#include <qtmetamacros.h>
-
-class QPainter;
-class QRect;
-class QWidget;
 
 class CardInfoPictureWithTextOverlayWidget : public CardInfoPictureWidget
 {
diff --git a/cockatrice/src/interface/widgets/cards/card_info_text_widget.cpp b/cockatrice/src/interface/widgets/cards/card_info_text_widget.cpp
index fa6cde311..e98c3c02a 100644
--- a/cockatrice/src/interface/widgets/cards/card_info_text_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/card_info_text_widget.cpp
@@ -1,26 +1,15 @@
 #include "card_info_text_widget.h"
 
-#include "../../../client/settings/cache_settings.h"
+#include "../../../game_graphics/board/card_item.h"
 #include "../../card_localization.h"
-#include "libcockatrice/card/card_info.h"
-#include "libcockatrice/card/printing/printing_info.h"
-#include "libcockatrice/card/set/card_set.h"
-#include "libcockatrice/settings/cards_display_settings.h"
 
 #include <QGridLayout>
 #include <QLabel>
-#include <QList>
 #include <QScrollArea>
 #include <QScrollBar>
-#include <QSharedPointer>
-#include <QSize>
-#include <QStringList>
 #include <QTextEdit>
-#include <QWidget>
 #include <libcockatrice/card/game_specific_terms.h>
 #include <libcockatrice/card/relation/card_relation.h>
-#include <qnamespace.h>
-#include <qobjectdefs.h>
 
 CardInfoTextWidget::CardInfoTextWidget(QWidget *parent) : QFrame(parent)
 {
diff --git a/cockatrice/src/interface/widgets/cards/card_info_text_widget.h b/cockatrice/src/interface/widgets/cards/card_info_text_widget.h
index 8223093fe..683be5ab5 100644
--- a/cockatrice/src/interface/widgets/cards/card_info_text_widget.h
+++ b/cockatrice/src/interface/widgets/cards/card_info_text_widget.h
@@ -10,13 +10,10 @@
 #include "libcockatrice/card/printing/exact_card.h"
 
 #include <QFrame>
-#include <QString>
-#include <qtmetamacros.h>
-
+#include <libcockatrice/card/card_info.h>
 class QLabel;
 class QScrollArea;
 class QTextEdit;
-class QWidget;
 
 class CardInfoTextWidget : public QFrame
 {
diff --git a/cockatrice/src/interface/widgets/cards/card_size_widget.cpp b/cockatrice/src/interface/widgets/cards/card_size_widget.cpp
index ab1840591..9cdfd4bce 100644
--- a/cockatrice/src/interface/widgets/cards/card_size_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/card_size_widget.cpp
@@ -1,19 +1,10 @@
 #include "card_size_widget.h"
 
-#include "../general/layout_containers/flow_widget.h"
+#include "../printing_selector/printing_selector.h"
+#include "../visual_deck_storage/visual_deck_storage_widget.h"
 
-#include <QEvent>
-#include <QFlags>
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QList>
-#include <QPoint>
 #include <QScrollArea>
-#include <QSizePolicy>
-#include <QSlider>
 #include <QWheelEvent>
-#include <QtGlobal>
-#include <qnamespace.h>
 
 /**
  * @class CardSizeWidget
diff --git a/cockatrice/src/interface/widgets/cards/card_size_widget.h b/cockatrice/src/interface/widgets/cards/card_size_widget.h
index 7de97a5e9..46883e792 100644
--- a/cockatrice/src/interface/widgets/cards/card_size_widget.h
+++ b/cockatrice/src/interface/widgets/cards/card_size_widget.h
@@ -9,15 +9,15 @@
 #ifndef CARD_SIZE_WIDGET_H
 #define CARD_SIZE_WIDGET_H
 
+#include "../general/layout_containers/flow_widget.h"
+
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QSlider>
 #include <QTimer>
 #include <QWidget>
-#include <qtmetamacros.h>
 
 class QWheelEvent;
-class FlowWidget;
-class QHBoxLayout;
-class QLabel;
-class QSlider;
 
 class CardSizeWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.cpp b/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.cpp
index 911e35285..a4b4eaf54 100644
--- a/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.cpp
@@ -1,38 +1,14 @@
 #include "deck_card_zone_display_widget.h"
 
 #include "../../../client/settings/cache_settings.h"
-#include "../general/display/banner_widget.h"
-#include "../visual_deck_editor/visual_deck_editor_widget.h"
-#include "card_group_display_widgets/card_group_display_widget.h"
 #include "card_group_display_widgets/flat_card_group_display_widget.h"
 #include "card_group_display_widgets/overlapped_card_group_display_widget.h"
-#include "libcockatrice/card/card_info.h"
 #include "libcockatrice/card/database/card_database_manager.h"
-#include "libcockatrice/card/database/card_database_querier.h"
-#include "libcockatrice/card/printing/exact_card.h"
-#include "libcockatrice/deck_list/tree/deck_list_card_node.h"
 #include "libcockatrice/settings/cards_display_settings.h"
 
-#include <QAbstractItemModel>
-#include <QDebug>
-#include <QItemSelection>
-#include <QItemSelectionModel>
-#include <QItemSelectionRange>
-#include <QLayout>
-#include <QLayoutItem>
-#include <QModelIndex>
-#include <QSharedPointer>
-#include <QSizePolicy>
-#include <QStringLiteral>
-#include <QTimer>
-#include <QVBoxLayout>
-#include <QVariant>
-#include <QtGlobal>
+#include <QResizeEvent>
+#include <algorithm>
 #include <libcockatrice/models/deck_list/deck_list_model.h>
-#include <qnamespace.h>
-
-class CardSizeWidget;
-class QMouseEvent;
 
 DeckCardZoneDisplayWidget::DeckCardZoneDisplayWidget(QWidget *parent,
                                                      DeckListModel *_deckListModel,
diff --git a/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.h b/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.h
index b7dc3ed3e..f25108834 100644
--- a/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.h
+++ b/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.h
@@ -7,27 +7,16 @@
 #ifndef DECK_CARD_ZONE_DISPLAY_WIDGET_H
 #define DECK_CARD_ZONE_DISPLAY_WIDGET_H
 
+#include "../general/display/banner_widget.h"
+#include "../general/layout_containers/overlap_widget.h"
 #include "../visual_deck_editor/visual_deck_editor_widget.h"
+#include "card_group_display_widgets/card_group_display_widget.h"
+#include "card_info_picture_with_text_overlay_widget.h"
+#include "card_size_widget.h"
 
-#include <QHash>
-#include <QList>
-#include <QMouseEvent>
-#include <QPersistentModelIndex>
-#include <QString>
-#include <QStringList>
+#include <QVBoxLayout>
 #include <QWidget>
-#include <qtmetamacros.h>
-
-class BannerWidget;
-class CardGroupDisplayWidget;
-class CardSizeWidget;
-class DeckListModel;
-class ExactCard;
-class OverlapWidget;
-class QItemSelection;
-class QItemSelectionModel;
-class QModelIndex;
-class QVBoxLayout;
+#include <libcockatrice/models/deck_list/deck_list_model.h>
 
 class DeckCardZoneDisplayWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/cards/deck_preview_card_picture_widget.cpp b/cockatrice/src/interface/widgets/cards/deck_preview_card_picture_widget.cpp
index 186c55755..147143e7f 100644
--- a/cockatrice/src/interface/widgets/cards/deck_preview_card_picture_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/deck_preview_card_picture_widget.cpp
@@ -1,15 +1,15 @@
 #include "deck_preview_card_picture_widget.h"
 
 #include "../../../client/settings/cache_settings.h"
-#include "card_info_picture_widget.h"
 
 #include <QApplication>
+#include <QFileInfo>
+#include <QFontMetrics>
 #include <QMouseEvent>
-#include <QTimer>
+#include <QPainterPath>
+#include <QStylePainter>
 #include <libcockatrice/settings/visual_deck_storage_settings.h>
 
-class QWidget;
-
 /**
  * @brief Constructs a CardPictureWithTextOverlay widget.
  * @param parent The parent widget.
diff --git a/cockatrice/src/interface/widgets/cards/deck_preview_card_picture_widget.h b/cockatrice/src/interface/widgets/cards/deck_preview_card_picture_widget.h
index 9643c7364..7571bc256 100644
--- a/cockatrice/src/interface/widgets/cards/deck_preview_card_picture_widget.h
+++ b/cockatrice/src/interface/widgets/cards/deck_preview_card_picture_widget.h
@@ -11,12 +11,9 @@
 #include "card_info_picture_with_text_overlay_widget.h"
 
 #include <QColor>
-#include <QMouseEvent>
-#include <qnamespace.h>
-#include <qtmetamacros.h>
-
-class QTimer;
-class QWidget;
+#include <QSize>
+#include <QTextOption>
+#include <QTimer>
 
 class DeckPreviewCardPictureWidget final : public CardInfoPictureWithTextOverlayWidget
 {
diff --git a/cockatrice/src/interface/widgets/deck_analytics/abstract_analytics_panel_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/abstract_analytics_panel_widget.cpp
index 730043d95..483fc71b0 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/abstract_analytics_panel_widget.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/abstract_analytics_panel_widget.cpp
@@ -1,16 +1,9 @@
 #include "abstract_analytics_panel_widget.h"
 
 #include "../../pixel_map_generator.h"
-#include "../general/display/banner_widget.h"
 #include "deck_list_statistics_analyzer.h"
 
-#include <QDialog>
-#include <QHBoxLayout>
 #include <QPushButton>
-#include <QSizePolicy>
-#include <QStringLiteral>
-#include <QVBoxLayout>
-#include <qnamespace.h>
 
 AbstractAnalyticsPanelWidget::AbstractAnalyticsPanelWidget(QWidget *parent, DeckListStatisticsAnalyzer *analyzer)
     : QWidget(parent), analyzer(analyzer)
diff --git a/cockatrice/src/interface/widgets/deck_analytics/abstract_analytics_panel_widget.h b/cockatrice/src/interface/widgets/deck_analytics/abstract_analytics_panel_widget.h
index c1afb78d0..23374a9e1 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/abstract_analytics_panel_widget.h
+++ b/cockatrice/src/interface/widgets/deck_analytics/abstract_analytics_panel_widget.h
@@ -3,16 +3,12 @@
 
 #include "../general/display/banner_widget.h"
 
+#include <QDialog>
 #include <QJsonObject>
-#include <QString>
+#include <QVBoxLayout>
 #include <QWidget>
-#include <qtmetamacros.h>
 
 class DeckListStatisticsAnalyzer;
-class QDialog;
-class QHBoxLayout;
-class QPushButton;
-class QVBoxLayout;
 
 class AbstractAnalyticsPanelWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/deck_analytics/add_analytics_panel_dialog.cpp b/cockatrice/src/interface/widgets/deck_analytics/add_analytics_panel_dialog.cpp
index f1ed5767c..c83e6d982 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/add_analytics_panel_dialog.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/add_analytics_panel_dialog.cpp
@@ -3,11 +3,8 @@
 #include "analytics_panel_widget_factory.h"
 
 #include <QDialogButtonBox>
-#include <QList>
 #include <QVBoxLayout>
 
-class QWidget;
-
 AddAnalyticsPanelDialog::AddAnalyticsPanelDialog(QWidget *parent) : QDialog(parent)
 {
     setWindowTitle(tr("Add Analytics Panel"));
diff --git a/cockatrice/src/interface/widgets/deck_analytics/add_analytics_panel_dialog.h b/cockatrice/src/interface/widgets/deck_analytics/add_analytics_panel_dialog.h
index f70c1d8f5..aa44734c2 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/add_analytics_panel_dialog.h
+++ b/cockatrice/src/interface/widgets/deck_analytics/add_analytics_panel_dialog.h
@@ -2,15 +2,12 @@
 #ifndef COCKATRICE_ADD_ANALYTICS_PANEL_DIALOG_H
 #define COCKATRICE_ADD_ANALYTICS_PANEL_DIALOG_H
 
+#include "analytics_panel_widget_factory.h"
+
 #include <QComboBox>
 #include <QDialog>
-#include <QString>
-#include <QVariant>
-#include <qtmetamacros.h>
-
-class QDialogButtonBox;
-class QVBoxLayout;
-class QWidget;
+#include <QDialogButtonBox>
+#include <QVBoxLayout>
 
 class AddAnalyticsPanelDialog : public QDialog
 {
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analytics_panel_widget_factory.cpp b/cockatrice/src/interface/widgets/deck_analytics/analytics_panel_widget_factory.cpp
index 79dda527d..e807e9d47 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analytics_panel_widget_factory.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/analytics_panel_widget_factory.cpp
@@ -2,8 +2,6 @@
 
 #include "abstract_analytics_panel_widget.h"
 
-#include <QSharedPointer>
-
 AnalyticsPanelWidgetFactory &AnalyticsPanelWidgetFactory::instance()
 {
     static AnalyticsPanelWidgetFactory f;
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analytics_panel_widget_factory.h b/cockatrice/src/interface/widgets/deck_analytics/analytics_panel_widget_factory.h
index 598498980..6c5856d70 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analytics_panel_widget_factory.h
+++ b/cockatrice/src/interface/widgets/deck_analytics/analytics_panel_widget_factory.h
@@ -1,9 +1,9 @@
 #ifndef COCKATRICE_DECK_ANALYTICS_WIDGET_FACTORY_H
 #define COCKATRICE_DECK_ANALYTICS_WIDGET_FACTORY_H
 
-#include <QList>
 #include <QMap>
 #include <QString>
+#include <QStringList>
 #include <QWidget>
 #include <functional>
 
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analytics_panel_widget_registrar.h b/cockatrice/src/interface/widgets/deck_analytics/analytics_panel_widget_registrar.h
index 99a6daf5d..70d6df94f 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analytics_panel_widget_registrar.h
+++ b/cockatrice/src/interface/widgets/deck_analytics/analytics_panel_widget_registrar.h
@@ -3,8 +3,6 @@
 
 #include "analytics_panel_widget_factory.h"
 
-#include <QString>
-
 class AnalyticsPanelWidgetRegistrar
 {
 public:
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config.cpp b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config.cpp
index 1c61116e3..51129a4b4 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config.cpp
@@ -1,8 +1,5 @@
 #include "draw_probability_config.h"
 
-#include <QJsonValue>
-#include <QJsonValueRef>
-
 QJsonObject DrawProbabilityConfig::toJson() const
 {
     QJsonObject o;
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp
index 28fd4c841..71f88c0fc 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp
@@ -5,10 +5,6 @@
 #include <QFormLayout>
 #include <QLabel>
 #include <QSpinBox>
-#include <QString>
-#include <QVariant>
-
-class QWidget;
 
 DrawProbabilityConfigDialog::DrawProbabilityConfigDialog(QWidget *parent) : QDialog(parent)
 {
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.h b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.h
index 3553db75d..44b1f0eec 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.h
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.h
@@ -3,13 +3,11 @@
 #include "draw_probability_config.h"
 
 #include <QDialog>
-#include <qtmetamacros.h>
+#include <QFormLayout>
 
 class QComboBox;
 class QSpinBox;
 class QLabel;
-class QFormLayout;
-class QWidget;
 
 class DrawProbabilityConfigDialog : public QDialog
 {
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp
index 90d9f58ef..0107294c7 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp
@@ -1,40 +1,21 @@
 #include "draw_probability_widget.h"
 
-#include "../../../general/display/banner_widget.h"
-#include "../../../general/layout_containers/flow_widget.h"
-#include "../../abstract_analytics_panel_widget.h"
-#include "../../deck_list_statistics_analyzer.h"
-#include "deck_list_model.h"
 #include "draw_probability_config_dialog.h"
-#include "libcockatrice/card/database/card_database_querier.h"
-#include "libcockatrice/deck_list/tree/deck_list_card_node.h"
 
-#include <QAbstractItemView>
-#include <QChar>
 #include <QComboBox>
 #include <QDialog>
+#include <QDialogButtonBox>
+#include <QFormLayout>
+#include <QHBoxLayout>
 #include <QHeaderView>
-#include <QJsonObject>
 #include <QLabel>
-#include <QList>
 #include <QMap>
-#include <QObject>
-#include <QSharedPointer>
-#include <QSizePolicy>
 #include <QSpinBox>
-#include <QString>
-#include <QStringList>
-#include <QTableWidget>
 #include <QTableWidgetItem>
-#include <QVBoxLayout>
-#include <QVariant>
-#include <QtGlobal>
+#include <QWidget>
 #include <QtMath>
 #include <libcockatrice/card/card_info.h>
 #include <libcockatrice/card/database/card_database_manager.h>
-#include <qnamespace.h>
-
-class QWidget;
 
 DrawProbabilityWidget::DrawProbabilityWidget(QWidget *parent, DeckListStatisticsAnalyzer *analyzer)
     : AbstractAnalyticsPanelWidget(parent, analyzer)
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.h b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.h
index 7c7bdb50a..9f7b971b1 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.h
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.h
@@ -1,19 +1,16 @@
 #ifndef COCKATRICE_DRAW_PROBABILITY_WIDGET_H
 #define COCKATRICE_DRAW_PROBABILITY_WIDGET_H
 
+#include "../../../../layouts/flow_layout.h"
+#include "../../../general/layout_containers/flow_widget.h"
 #include "../../abstract_analytics_panel_widget.h"
+#include "../../deck_list_statistics_analyzer.h"
 #include "draw_probability_config.h"
 
-#include <qtmetamacros.h>
-
-class DeckListStatisticsAnalyzer;
-class FlowWidget;
-class QComboBox;
-class QLabel;
-class QLineEdit;
-class QSpinBox;
-class QTableWidget;
-class QWidget;
+#include <QComboBox>
+#include <QLineEdit>
+#include <QSpinBox>
+#include <QTableWidget>
 
 class DrawProbabilityWidget : public AbstractAnalyticsPanelWidget
 {
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config.cpp b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config.cpp
index 41ebdec1e..2f9f60752 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config.cpp
@@ -1,9 +1,5 @@
 #include "mana_base_config.h"
 
-#include <QJsonArray>
-#include <QJsonValue>
-#include <QJsonValueRef>
-
 QJsonObject ManaBaseConfig::toJson() const
 {
     QJsonObject jsonObject;
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config.h b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config.h
index 5fd45af62..d01f88b8b 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config.h
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config.h
@@ -2,9 +2,8 @@
 #ifndef COCKATRICE_MANA_BASE_CONFIG_H
 #define COCKATRICE_MANA_BASE_CONFIG_H
 
+#include <QJsonArray>
 #include <QJsonObject>
-#include <QList>
-#include <QString>
 #include <QStringList>
 
 struct ManaBaseConfig
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp
index 32b54c485..83e35d57d 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp
@@ -1,19 +1,6 @@
 #include "mana_base_config_dialog.h"
 
-#include "../../deck_list_statistics_analyzer.h"
-
-#include <QAbstractItemView>
-#include <QComboBox>
-#include <QDialogButtonBox>
-#include <QHash>
-#include <QLabel>
-#include <QListWidget>
-#include <QListWidgetItem>
 #include <QPushButton>
-#include <QStringList>
-#include <QVBoxLayout>
-
-class QWidget;
 
 ManaBaseConfigDialog::ManaBaseConfigDialog(DeckListStatisticsAnalyzer *analyzer,
                                            ManaBaseConfig initial,
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.h b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.h
index b0ae77076..a816f154f 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.h
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.h
@@ -2,20 +2,18 @@
 #ifndef COCKATRICE_MANA_BASE_ADD_DIALOG_H
 #define COCKATRICE_MANA_BASE_ADD_DIALOG_H
 
+#include "../../deck_list_statistics_analyzer.h"
 #include "mana_base_config.h"
 
+#include <QCheckBox>
+#include <QComboBox>
 #include <QDialog>
-#include <QList>
-#include <QString>
-#include <qtmetamacros.h>
-
-class DeckListStatisticsAnalyzer;
-class QComboBox;
-class QDialogButtonBox;
-class QLabel;
-class QListWidget;
-class QVBoxLayout;
-class QWidget;
+#include <QDialogButtonBox>
+#include <QJsonArray>
+#include <QJsonObject>
+#include <QLabel>
+#include <QListWidget>
+#include <QVBoxLayout>
 
 class ManaBaseConfigDialog : public QDialog
 {
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp
index fc7914b94..0093c360b 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp
@@ -3,27 +3,12 @@
 #include "../../../general/display/charts/bars/bar_widget.h"
 #include "../../../general/display/charts/bars/color_bar.h"
 #include "../../../general/display/charts/pies/color_pie.h"
-#include "../../abstract_analytics_panel_widget.h"
 #include "../../analytics_panel_widget_registrar.h"
-#include "../../deck_list_statistics_analyzer.h"
 #include "mana_base_config_dialog.h"
 
-#include <QColor>
 #include <QDialog>
-#include <QHBoxLayout>
-#include <QHash>
-#include <QLayoutItem>
-#include <QMap>
-#include <QObject>
-#include <QPair>
-#include <QSharedPointer>
-#include <QSize>
-#include <QVBoxLayout>
-#include <QWidget>
-#include <algorithm>
+#include <QListWidget>
 #include <libcockatrice/utility/color.h>
-#include <qnamespace.h>
-#include <utility>
 
 namespace
 {
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.h b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.h
index 7ec5ecefe..85b2a13b3 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.h
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.h
@@ -7,17 +7,16 @@
 #ifndef MANA_BASE_WIDGET_H
 #define MANA_BASE_WIDGET_H
 
+#include "../../../general/display/banner_widget.h"
 #include "../../abstract_analytics_panel_widget.h"
+#include "../../deck_list_statistics_analyzer.h"
 #include "mana_base_config.h"
 
-#include <QJsonObject>
-#include <QList>
-#include <QString>
-#include <qtmetamacros.h>
-
-class DeckListStatisticsAnalyzer;
-class QHBoxLayout;
-class QWidget;
+#include <QHBoxLayout>
+#include <QWidget>
+#include <libcockatrice/deck_list/deck_list.h>
+#include <libcockatrice/models/deck_list/deck_list_model.h>
+#include <utility>
 
 class ManaBaseWidget : public AbstractAnalyticsPanelWidget
 {
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_category_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_category_widget.cpp
index 7e15058a4..a0ccedc74 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_category_widget.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_category_widget.cpp
@@ -1,21 +1,9 @@
 #include "mana_curve_category_widget.h"
 
-#include "../../../general/display/charts/bars/bar_chart_widget.h"
 #include "libcockatrice/utility/color.h"
 #include "libcockatrice/utility/qt_utils.h"
 #include "mana_curve_config.h"
-
-#include <QHBoxLayout>
-#include <QHash>
-#include <QLabel>
-#include <QList>
-#include <QSharedPointer>
-#include <QSize>
-#include <QSizePolicy>
-#include <QString>
-#include <QVBoxLayout>
-#include <QVector>
-#include <algorithm>
+#include "mana_curve_total_widget.h"
 
 constexpr int MIN_ROW_HEIGHT = 100; // Minimum readable height per row
 
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_category_widget.h b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_category_widget.h
index 1794d5cab..c6aa6f1f0 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_category_widget.h
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_category_widget.h
@@ -1,14 +1,12 @@
 #ifndef COCKATRICE_MANA_CURVE_CATEGORY_WIDGET_H
 #define COCKATRICE_MANA_CURVE_CATEGORY_WIDGET_H
 
-#include <QStringList>
-#include <QWidget>
-#include <qtmetamacros.h>
+#include "../../../general/display/charts/bars/bar_chart_widget.h"
+#include "mana_curve_config.h"
 
-class QString;
-class QVBoxLayout;
-struct ManaCurveConfig;
-template <typename Key, typename T> class QHash;
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QWidget>
 
 class ManaCurveCategoryWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config.cpp b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config.cpp
index 190642ad9..0dfef1b66 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config.cpp
@@ -1,9 +1,5 @@
 #include "mana_curve_config.h"
 
-#include <QJsonArray>
-#include <QJsonValue>
-#include <QJsonValueRef>
-
 QJsonObject ManaCurveConfig::toJson() const
 {
     QJsonObject jsonObject;
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config.h b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config.h
index 28224db03..55222dd98 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config.h
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config.h
@@ -2,9 +2,8 @@
 #ifndef COCKATRICE_MANA_CURVE_CONFIG_H
 #define COCKATRICE_MANA_CURVE_CONFIG_H
 
+#include <QJsonArray>
 #include <QJsonObject>
-#include <QList>
-#include <QString>
 #include <QStringList>
 
 struct ManaCurveConfig
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp
index c5498ff3e..9e9ae98a6 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp
@@ -1,22 +1,12 @@
 #include "mana_curve_config_dialog.h"
 
-#include "../../deck_list_statistics_analyzer.h"
-
-#include <QAbstractItemView>
 #include <QCheckBox>
 #include <QComboBox>
 #include <QDialogButtonBox>
-#include <QHash>
 #include <QLabel>
-#include <QList>
 #include <QListWidget>
-#include <QListWidgetItem>
-#include <QString>
-#include <QStringList>
 #include <QVBoxLayout>
 
-class QWidget;
-
 ManaCurveConfigDialog::ManaCurveConfigDialog(DeckListStatisticsAnalyzer *analyzer, QWidget *parent)
     : QDialog(parent), analyzer(analyzer)
 {
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.h b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.h
index 47ce1b8c2..17e6776e5 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.h
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.h
@@ -1,18 +1,16 @@
 #ifndef COCKATRICE_MANA_CURVE_ADD_DIALOG_H
 #define COCKATRICE_MANA_CURVE_ADD_DIALOG_H
 
+#include "../../deck_list_statistics_analyzer.h"
 #include "mana_curve_config.h"
 
 #include <QDialog>
-#include <qtmetamacros.h>
+#include <QDialogButtonBox>
+#include <QLabel>
 
 class QListWidget;
 class QCheckBox;
 class QComboBox;
-class DeckListStatisticsAnalyzer;
-class QDialogButtonBox;
-class QLabel;
-class QWidget;
 
 class ManaCurveConfigDialog : public QDialog
 {
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_total_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_total_widget.cpp
index f1d9ea8c7..c04767015 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_total_widget.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_total_widget.cpp
@@ -2,18 +2,10 @@
 
 #include "../../../general/display/charts/bars/bar_chart_widget.h"
 #include "libcockatrice/utility/color.h"
+#include "libcockatrice/utility/qt_utils.h"
 #include "mana_curve_config.h"
 
 #include <QHBoxLayout>
-#include <QLabel>
-#include <QList>
-#include <QMap>
-#include <QSharedPointer>
-#include <QSize>
-#include <QSizePolicy>
-#include <QVector>
-#include <algorithm>
-#include <compare>
 
 ManaCurveTotalWidget::ManaCurveTotalWidget(QWidget *parent) : QWidget(parent)
 {
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_total_widget.h b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_total_widget.h
index 0eaecec96..203f75345 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_total_widget.h
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_total_widget.h
@@ -1,15 +1,11 @@
 #ifndef COCKATRICE_MANA_CURVE_TOTAL_WIDGET_H
 #define COCKATRICE_MANA_CURVE_TOTAL_WIDGET_H
-#include <QString>
-#include <QStringList>
-#include <QWidget>
-#include <qtmetamacros.h>
+#include "../../../general/display/charts/bars/bar_chart_widget.h"
+#include "mana_curve_config.h"
 
-class BarChartWidget;
-class QHBoxLayout;
-class QLabel;
-struct ManaCurveConfig;
-template <class Key, class T> class QMap;
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QWidget>
 
 class ManaCurveTotalWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.cpp
index 6d93bde54..b182bf954 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.cpp
@@ -1,23 +1,19 @@
 #include "mana_curve_widget.h"
 
-#include "../../abstract_analytics_panel_widget.h"
+#include "../../../general/display/charts/bars/bar_chart_background_widget.h"
+#include "../../../general/display/charts/bars/bar_chart_widget.h"
+#include "../../../general/display/charts/bars/segmented_bar_widget.h"
 #include "../../analytics_panel_widget_registrar.h"
 #include "../../deck_list_statistics_analyzer.h"
-#include "mana_curve_category_widget.h"
+#include "libcockatrice/utility/color.h"
+#include "libcockatrice/utility/qt_utils.h"
 #include "mana_curve_config_dialog.h"
-#include "mana_curve_total_widget.h"
 
-#include <QDialog>
-#include <QHash>
-#include <QMap>
-#include <QObject>
-#include <QSharedPointer>
-#include <QSizePolicy>
-#include <QStringList>
-#include <QVBoxLayout>
-#include <QtGlobal>
-
-class QWidget;
+#include <QInputDialog>
+#include <QJsonArray>
+#include <QLabel>
+#include <QPushButton>
+#include <QSettings>
 
 namespace
 {
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.h b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.h
index 14c445717..d3e56d44c 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.h
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.h
@@ -8,17 +8,14 @@
 #define MANA_CURVE_WIDGET_H
 
 #include "../../abstract_analytics_panel_widget.h"
+#include "mana_curve_category_widget.h"
 #include "mana_curve_config.h"
+#include "mana_curve_total_widget.h"
 
-#include <QJsonObject>
-#include <QList>
-#include <QString>
-#include <qtmetamacros.h>
+#include <QVBoxLayout>
 
+class SegmentedBarWidget;
 class DeckListStatisticsAnalyzer;
-class ManaCurveCategoryWidget;
-class ManaCurveTotalWidget;
-class QWidget;
 
 class ManaCurveWidget : public AbstractAnalyticsPanelWidget
 {
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config.cpp b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config.cpp
index 7a6f0b51a..ee57cb1e2 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config.cpp
@@ -1,9 +1,5 @@
 #include "mana_devotion_config.h"
 
-#include <QJsonArray>
-#include <QJsonValue>
-#include <QJsonValueRef>
-
 QJsonObject ManaDevotionConfig::toJson() const
 {
     QJsonObject jsonObject;
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config.h b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config.h
index 480b2151c..08be146e5 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config.h
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config.h
@@ -1,9 +1,8 @@
 #ifndef COCKATRICE_MANA_DEVOTION_CONFIG_H
 #define COCKATRICE_MANA_DEVOTION_CONFIG_H
 
+#include <QJsonArray>
 #include <QJsonObject>
-#include <QList>
-#include <QString>
 #include <QStringList>
 
 struct ManaDevotionConfig
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp
index 0d70fc24d..b01c33ba5 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp
@@ -1,19 +1,5 @@
 #include "mana_devotion_config_dialog.h"
 
-#include "../../deck_list_statistics_analyzer.h"
-
-#include <QAbstractItemView>
-#include <QComboBox>
-#include <QDialogButtonBox>
-#include <QHash>
-#include <QLabel>
-#include <QListWidget>
-#include <QListWidgetItem>
-#include <QStringList>
-#include <QVBoxLayout>
-
-class QWidget;
-
 ManaDevotionConfigDialog::ManaDevotionConfigDialog(DeckListStatisticsAnalyzer *analyzer,
                                                    ManaDevotionConfig initial,
                                                    QWidget *parent)
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.h b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.h
index 9c37ec5ad..fd804e2af 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.h
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.h
@@ -2,20 +2,16 @@
 #ifndef COCKATRICE_MANA_DEVOTION_ADD_DIALOG_H
 #define COCKATRICE_MANA_DEVOTION_ADD_DIALOG_H
 
+#include "../../deck_list_statistics_analyzer.h"
 #include "mana_devotion_config.h"
 
+#include <QCheckBox>
+#include <QComboBox>
 #include <QDialog>
-#include <QList>
-#include <QString>
-#include <qtmetamacros.h>
-
-class DeckListStatisticsAnalyzer;
-class QComboBox;
-class QDialogButtonBox;
-class QLabel;
-class QListWidget;
-class QVBoxLayout;
-class QWidget;
+#include <QDialogButtonBox>
+#include <QLabel>
+#include <QListWidget>
+#include <QVBoxLayout>
 
 class ManaDevotionConfigDialog : public QDialog
 {
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.cpp
index 7e1f0c211..709577ff2 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.cpp
@@ -3,26 +3,12 @@
 #include "../../../general/display/charts/bars/bar_widget.h"
 #include "../../../general/display/charts/bars/color_bar.h"
 #include "../../../general/display/charts/pies/color_pie.h"
-#include "../../abstract_analytics_panel_widget.h"
 #include "../../analytics_panel_widget_registrar.h"
 #include "../../deck_list_statistics_analyzer.h"
 #include "mana_devotion_config_dialog.h"
 
-#include <QChar>
-#include <QColor>
-#include <QDialog>
-#include <QHBoxLayout>
 #include <QHash>
-#include <QLayoutItem>
-#include <QMap>
-#include <QObject>
-#include <QSharedPointer>
-#include <QSize>
-#include <QVBoxLayout>
-#include <QWidget>
-#include <algorithm>
-#include <qnamespace.h>
-#include <utility>
+#include <QInputDialog>
 
 namespace
 {
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.h b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.h
index 2b0182c1e..af0215305 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.h
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.h
@@ -6,17 +6,11 @@
 
 #ifndef MANA_DEVOTION_WIDGET_H
 #define MANA_DEVOTION_WIDGET_H
+#include "../../../general/display/banner_widget.h"
 #include "../../abstract_analytics_panel_widget.h"
 #include "mana_devotion_config.h"
 
-#include <QJsonObject>
-#include <QList>
-#include <QString>
-#include <qtmetamacros.h>
-
-class DeckListStatisticsAnalyzer;
-class QHBoxLayout;
-class QWidget;
+#include <QHBoxLayout>
 
 class ManaDevotionWidget : public AbstractAnalyticsPanelWidget
 {
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config.cpp b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config.cpp
index ab321661e..01af9329c 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config.cpp
@@ -1,9 +1,5 @@
 #include "mana_distribution_config.h"
 
-#include <QJsonArray>
-#include <QJsonValue>
-#include <QJsonValueRef>
-
 QJsonObject ManaDistributionConfig::toJson() const
 {
     QJsonObject o;
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config.h b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config.h
index 012b0f4a7..d1aa0f48e 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config.h
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config.h
@@ -1,8 +1,8 @@
 #ifndef COCKATRICE_MANA_DISTRIBUTION_CONFIG_H
 #define COCKATRICE_MANA_DISTRIBUTION_CONFIG_H
 
+#include <QJsonArray>
 #include <QJsonObject>
-#include <QList>
 #include <QString>
 #include <QStringList>
 
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp
index 24b71bae0..325c70028 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp
@@ -1,19 +1,12 @@
 #include "mana_distribution_config_dialog.h"
 
-#include <QAbstractItemView>
 #include <QCheckBox>
 #include <QComboBox>
 #include <QDialogButtonBox>
 #include <QLabel>
-#include <QList>
 #include <QListWidget>
-#include <QListWidgetItem>
-#include <QString>
-#include <QStringList>
 #include <QVBoxLayout>
 
-class QWidget;
-
 static const QStringList kColors = {"W", "U", "B", "R", "G", "C"};
 
 ManaDistributionConfigDialog::ManaDistributionConfigDialog(DeckListStatisticsAnalyzer *analyzer, QWidget *parent)
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.h b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.h
index 3d21b6bee..57c88e29d 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.h
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.h
@@ -4,15 +4,14 @@
 #include "mana_distribution_config.h"
 
 #include <QDialog>
-#include <qtmetamacros.h>
+#include <QDialogButtonBox>
+#include <QLabel>
+#include <QStringList>
 
 class QComboBox;
 class QListWidget;
 class QCheckBox;
 class DeckListStatisticsAnalyzer;
-class QDialogButtonBox;
-class QLabel;
-class QWidget;
 
 class ManaDistributionConfigDialog : public QDialog
 {
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp
index 4faa105e6..8a5e14858 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp
@@ -2,10 +2,7 @@
 
 #include "../../../cards/additional_info/mana_symbol_widget.h"
 
-#include <QLabel>
-#include <QProgressBar>
 #include <QVBoxLayout>
-#include <qnamespace.h>
 
 ManaDistributionSingleDisplayWidget::ManaDistributionSingleDisplayWidget(const QString &colorSymbol, QWidget *parent)
     : QWidget(parent)
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.h b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.h
index 2fd3efb2d..e33d0cec1 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.h
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.h
@@ -1,12 +1,10 @@
 #ifndef COCKATRICE_MANA_DISTRIBUTION_SINGLE_DISPLAY_WIDGET_H
 #define COCKATRICE_MANA_DISTRIBUTION_SINGLE_DISPLAY_WIDGET_H
 
-#include <QString>
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QProgressBar>
 #include <QWidget>
-#include <qtmetamacros.h>
-
-class QLabel;
-class QProgressBar;
 
 class ManaDistributionSingleDisplayWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp
index 5543c64df..8eaea1426 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp
@@ -1,21 +1,12 @@
 #include "mana_distribution_widget.h"
 
-#include "../../../general/display/charts/bars/color_bar.h"
-#include "../../../general/display/charts/pies/color_pie.h"
-#include "../../abstract_analytics_panel_widget.h"
 #include "../../analytics_panel_widget_registrar.h"
-#include "../../deck_list_statistics_analyzer.h"
 #include "mana_distribution_config_dialog.h"
-#include "mana_distribution_single_display_widget.h"
 
-#include <QDialog>
-#include <QHBoxLayout>
-#include <QHash>
-#include <QList>
-#include <QSharedPointer>
-#include <QStringList>
+#include <QComboBox>
+#include <QDialogButtonBox>
+#include <QLabel>
 #include <QVBoxLayout>
-#include <QWidget>
 
 namespace
 {
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.h b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.h
index 6230e0201..2d834f3af 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.h
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.h
@@ -1,21 +1,17 @@
 #ifndef COCKATRICE_MANA_DISTRIBUTION_WIDGET_H
 #define COCKATRICE_MANA_DISTRIBUTION_WIDGET_H
 
+#include "../../../general/display/charts/bars/color_bar.h"
+#include "../../../general/display/charts/pies/color_pie.h"
 #include "../../abstract_analytics_panel_widget.h"
+#include "../../deck_list_statistics_analyzer.h"
 #include "mana_distribution_config.h"
+#include "mana_distribution_single_display_widget.h"
 
-#include <QJsonObject>
+#include <QHBoxLayout>
 #include <QMap>
-#include <QString>
-#include <qtmetamacros.h>
-
-class ColorBar;
-class ColorPie;
-class DeckListStatisticsAnalyzer;
-class ManaDistributionSingleDisplayWidget;
-class QHBoxLayout;
-class QVBoxLayout;
-class QWidget;
+#include <QVBoxLayout>
+#include <QWidget>
 
 class ManaDistributionWidget : public AbstractAnalyticsPanelWidget
 {
diff --git a/cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.cpp
index 9f6257930..76552ea2f 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.cpp
@@ -1,6 +1,5 @@
 #include "deck_analytics_widget.h"
 
-#include "../general/layout_containers/flow_widget.h"
 #include "abstract_analytics_panel_widget.h"
 #include "add_analytics_panel_dialog.h"
 #include "analytics_panel_widget_factory.h"
@@ -10,19 +9,13 @@
 #include "deck_list_statistics_analyzer.h"
 #include "resizable_panel.h"
 
-#include <QCheckBox>
-#include <QDialog>
 #include <QEvent>
-#include <QFrame>
 #include <QJsonArray>
 #include <QJsonDocument>
-#include <QJsonValueRef>
 #include <QPushButton>
 #include <QScrollArea>
 #include <QSettings>
 #include <QVBoxLayout>
-#include <QVariant>
-#include <qnamespace.h>
 
 DeckAnalyticsWidget::DeckAnalyticsWidget(QWidget *parent, DeckListStatisticsAnalyzer *_statsAnalyzer)
     : QWidget(parent), statsAnalyzer(_statsAnalyzer)
diff --git a/cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.h b/cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.h
index f1e071ff6..3c73deca2 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.h
+++ b/cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.h
@@ -7,22 +7,19 @@
 #ifndef DECK_ANALYTICS_WIDGET_H
 #define DECK_ANALYTICS_WIDGET_H
 
+#include "../general/layout_containers/flow_widget.h"
+#include "abstract_analytics_panel_widget.h"
+#include "deck_list_statistics_analyzer.h"
+#include "resizable_panel.h"
+
+#include <QCheckBox>
 #include <QJsonObject>
-#include <QList>
-#include <QString>
+#include <QScrollArea>
+#include <QVBoxLayout>
 #include <QVector>
 #include <QWidget>
-#include <qtmetamacros.h>
 
 class LayoutInspector;
-class AbstractAnalyticsPanelWidget;
-class DeckListStatisticsAnalyzer;
-class FlowWidget;
-class QCheckBox;
-class QPushButton;
-class QScrollArea;
-class QVBoxLayout;
-class ResizablePanel;
 
 class DeckAnalyticsWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/deck_analytics/deck_list_statistics_analyzer.cpp b/cockatrice/src/interface/widgets/deck_analytics/deck_list_statistics_analyzer.cpp
index c2f70759e..add13ff21 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/deck_list_statistics_analyzer.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/deck_list_statistics_analyzer.cpp
@@ -1,19 +1,11 @@
 #include "deck_list_statistics_analyzer.h"
 
 #include "deck_list_model.h"
-#include "libcockatrice/card/card_info.h"
-#include "libcockatrice/card/database/card_database_querier.h"
-#include "libcockatrice/deck_list/tree/deck_list_card_node.h"
-#include "libcockatrice/deck_list/tree/inner_deck_list_node.h"
+#include "deck_list_statistics_analyzer.h"
 
-#include <QChar>
 #include <QRegularExpression>
-#include <QRegularExpressionMatch>
-#include <QSharedPointer>
-#include <QStringLiteral>
-#include <initializer_list>
 #include <libcockatrice/card/database/card_database_manager.h>
-#include <utility>
+#include <libcockatrice/deck_list/deck_list.h>
 
 DeckListStatisticsAnalyzer::DeckListStatisticsAnalyzer(QObject *parent,
                                                        DeckListModel *_model,
diff --git a/cockatrice/src/interface/widgets/deck_analytics/deck_list_statistics_analyzer.h b/cockatrice/src/interface/widgets/deck_analytics/deck_list_statistics_analyzer.h
index c3643d65f..52ae751bf 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/deck_list_statistics_analyzer.h
+++ b/cockatrice/src/interface/widgets/deck_analytics/deck_list_statistics_analyzer.h
@@ -1,12 +1,10 @@
 #ifndef COCKATRICE_DECK_LIST_STATISTICS_ANALYZER_H
 #define COCKATRICE_DECK_LIST_STATISTICS_ANALYZER_H
 
+#include "deck_list_model.h"
+
 #include <QHash>
-#include <QList>
 #include <QObject>
-#include <QString>
-#include <QStringList>
-#include <qtmetamacros.h>
 #include <unordered_map>
 
 class DeckListModel;
diff --git a/cockatrice/src/interface/widgets/deck_analytics/resizable_panel.cpp b/cockatrice/src/interface/widgets/deck_analytics/resizable_panel.cpp
index f46679406..250fe1ad3 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/resizable_panel.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/resizable_panel.cpp
@@ -1,34 +1,11 @@
 #include "resizable_panel.h"
 
-#include "abstract_analytics_panel_widget.h"
 #include "libcockatrice/utility/qt_utils.h"
 
-#include <QApplication>
-#include <QByteArray>
 #include <QColor>
-#include <QDrag>
-#include <QDragEnterEvent>
-#include <QDragMoveEvent>
-#include <QDropEvent>
-#include <QEvent>
-#include <QFlags>
-#include <QFrame>
 #include <QHBoxLayout>
-#include <QMimeData>
-#include <QMouseEvent>
-#include <QPalette>
 #include <QPixmap>
-#include <QPointF>
-#include <QPushButton>
-#include <QRect>
-#include <QScrollArea>
-#include <QScrollBar>
-#include <QSize>
-#include <QSizePolicy>
-#include <QTimer>
-#include <QVBoxLayout>
 #include <QtGlobal>
-#include <qnamespace.h>
 
 ResizablePanel::ResizablePanel(const QString &_typeId, AbstractAnalyticsPanelWidget *analyticsPanel, QWidget *parent)
     : QWidget(parent), panel(analyticsPanel), typeId(_typeId)
diff --git a/cockatrice/src/interface/widgets/deck_analytics/resizable_panel.h b/cockatrice/src/interface/widgets/deck_analytics/resizable_panel.h
index 809703847..d958ec64d 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/resizable_panel.h
+++ b/cockatrice/src/interface/widgets/deck_analytics/resizable_panel.h
@@ -1,15 +1,19 @@
 #ifndef COCKATRICE_RESIZABLE_PANEL_H
 #define COCKATRICE_RESIZABLE_PANEL_H
 
-#include <QPoint>
-#include <QString>
-#include <QWidget>
-#include <qtmetamacros.h>
+#include "abstract_analytics_panel_widget.h"
 
-class AbstractAnalyticsPanelWidget;
-class QFrame;
-class QPushButton;
-class QTimer;
+#include <QApplication>
+#include <QDrag>
+#include <QFrame>
+#include <QMimeData>
+#include <QMouseEvent>
+#include <QPushButton>
+#include <QScrollArea>
+#include <QScrollBar>
+#include <QTimer>
+#include <QVBoxLayout>
+#include <QWidget>
 
 class ResizablePanel : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/deck_editor/card_database_view.cpp b/cockatrice/src/interface/widgets/deck_editor/card_database_view.cpp
index e8f6398f7..00388a3cd 100644
--- a/cockatrice/src/interface/widgets/deck_editor/card_database_view.cpp
+++ b/cockatrice/src/interface/widgets/deck_editor/card_database_view.cpp
@@ -1,35 +1,17 @@
 #include "card_database_view.h"
 
 #include "../../../client/settings/cache_settings.h"
-#include "../../key_signals.h"
 #include "card_database_display_model.h"
 #include "card_database_model.h"
-#include "libcockatrice/card/card_info.h"
-#include "libcockatrice/card/database/card_database_querier.h"
 
-#include <QAbstractItemModel>
-#include <QAction>
 #include <QApplication>
-#include <QByteArray>
 #include <QClipboard>
-#include <QFlags>
 #include <QHeaderView>
-#include <QItemSelectionModel>
-#include <QList>
 #include <QMenu>
-#include <QModelIndex>
-#include <QModelIndexList>
-#include <QPoint>
-#include <QSharedPointer>
-#include <QVariant>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/card/relation/card_relation.h>
 #include <libcockatrice/deck_list/tree/inner_deck_list_node.h>
 #include <libcockatrice/settings/layouts_settings.h>
-#include <qnamespace.h>
-#include <utility>
-
-class QWidget;
 
 static bool canBeCommander(const CardInfo &cardInfo)
 {
diff --git a/cockatrice/src/interface/widgets/deck_editor/card_database_view.h b/cockatrice/src/interface/widgets/deck_editor/card_database_view.h
index c095c544d..668444199 100644
--- a/cockatrice/src/interface/widgets/deck_editor/card_database_view.h
+++ b/cockatrice/src/interface/widgets/deck_editor/card_database_view.h
@@ -3,19 +3,12 @@
 
 #include "../../key_signals.h"
 
-#include <QPair>
-#include <QString>
-#include <QStringList>
 #include <QTreeView>
 #include <functional>
 #include <libcockatrice/card/card_info.h>
-#include <qtmetamacros.h>
 
+class CardDatabaseModel;
 class CardDatabaseDisplayModel;
-class QModelIndex;
-class QPoint;
-class QWidget;
-template <typename T> class QList;
 
 /**
  * @brief The card database table.
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp
index 57ae6eadd..6269f0323 100644
--- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp
@@ -2,23 +2,10 @@
 
 #include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
 #include "card_database_view.h"
-#include "deck_editor_database_display_widget.h"
-#include "deck_list_model.h"
 #include "deck_state_manager.h"
 #include "deck_zone_dialog.h"
-#include "libcockatrice/card/printing/exact_card.h"
-#include "libcockatrice/deck_list/tree/inner_deck_list_node.h"
 
-#include <QFlags>
-#include <QList>
-#include <QPair>
-#include <QString>
-#include <QStringList>
-#include <QVBoxLayout>
-#include <QWidget>
-#include <functional>
-#include <qnamespace.h>
-#include <utility>
+#include <libcockatrice/deck_list/deck_list_node_tree.h>
 
 DeckEditorCardDatabaseDockWidget::DeckEditorCardDatabaseDockWidget(AbstractTabDeckEditor *parent) : QDockWidget(parent)
 {
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.h b/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.h
index b73843bc7..6af2e4432 100644
--- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.h
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.h
@@ -1,10 +1,12 @@
 #ifndef COCKATRICE_DECK_EDITOR_CARD_DATABASE_DOCK_WIDGET_H
 #define COCKATRICE_DECK_EDITOR_CARD_DATABASE_DOCK_WIDGET_H
 
+#include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
+
 #include <QDockWidget>
-#include <qtmetamacros.h>
 
 class AbstractTabDeckEditor;
+class CardDatabase;
 class DeckEditorDatabaseDisplayWidget;
 class FilterTree;
 
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp
index 1b920ea1d..a78a9c9c5 100644
--- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp
@@ -1,14 +1,8 @@
 #include "deck_editor_card_info_dock_widget.h"
 
 #include "../cards/card_info_frame_widget.h"
-#include "../tabs/abstract_tab_deck_editor.h"
 
-#include <QFlags>
 #include <QVBoxLayout>
-#include <QWidget>
-#include <qnamespace.h>
-
-class ExactCard;
 
 DeckEditorCardInfoDockWidget::DeckEditorCardInfoDockWidget(AbstractTabDeckEditor *parent)
     : QDockWidget(parent), deckEditor(parent)
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.h b/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.h
index 2f204306d..086ca2ca4 100644
--- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.h
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.h
@@ -8,13 +8,12 @@
 #ifndef DECK_EDITOR_CARD_INFO_DOCK_WIDGET_H
 #define DECK_EDITOR_CARD_INFO_DOCK_WIDGET_H
 
+#include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
+#include "../cards/card_info_frame_widget.h"
+
 #include <QDockWidget>
-#include <qtmetamacros.h>
 
 class AbstractTabDeckEditor;
-class CardInfoFrameWidget;
-class ExactCard;
-
 class DeckEditorCardInfoDockWidget : public QDockWidget
 {
     Q_OBJECT
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp
index 7ed398535..a83e25f5f 100644
--- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp
@@ -2,30 +2,19 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../../filters/syntax_help.h"
-#include "../../key_signals.h"
+#include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
+#include "../../../interface/widgets/tabs/tab_supervisor.h"
 #include "../../pixel_map_generator.h"
-#include "../utility/custom_line_edit.h"
-#include "card_database_display_model.h"
-#include "card_database_model.h"
 #include "card_database_view.h"
-#include "libcockatrice/card/database/card_database_querier.h"
-#include "libcockatrice/card/printing/exact_card.h"
-#include "libcockatrice/deck_list/tree/inner_deck_list_node.h"
 
-#include <QAction>
-#include <QHBoxLayout>
-#include <QIcon>
-#include <QLineEdit>
-#include <QStringLiteral>
+#include <QClipboard>
+#include <QHeaderView>
 #include <QToolButton>
-#include <QVBoxLayout>
+#include <QTreeView>
 #include <libcockatrice/card/card_localization.h>
 #include <libcockatrice/card/database/card_database_manager.h>
+#include <libcockatrice/card/relation/card_relation.h>
 #include <libcockatrice/settings/cards_display_settings.h>
-#include <libcockatrice/utility/card_ref.h>
-#include <qnamespace.h>
-
-class FilterTree;
 
 DeckEditorDatabaseDisplayWidget::DeckEditorDatabaseDisplayWidget(QWidget *parent, CardDatabaseModel *databaseModel)
     : QWidget(parent)
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.h b/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.h
index e9edec125..5de4d211d 100644
--- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.h
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.h
@@ -8,21 +8,16 @@
 #ifndef DECK_EDITOR_DATABASE_DISPLAY_WIDGET_H
 #define DECK_EDITOR_DATABASE_DISPLAY_WIDGET_H
 
-#include "libcockatrice/card/card_info.h"
+#include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
+#include "../utility/custom_line_edit.h"
 
-#include <QString>
+#include <QHBoxLayout>
 #include <QWidget>
-#include <qtmetamacros.h>
+#include <libcockatrice/models/database/card_database_display_model.h>
+#include <libcockatrice/models/database/card_database_model.h>
 
 class CardDatabaseView;
-class CardDatabaseDisplayModel;
-class CardDatabaseModel;
-class ExactCard;
-class FilterTree;
-class QAction;
-class QHBoxLayout;
-class QVBoxLayout;
-class SearchLineEdit;
+class AbstractTabDeckEditor;
 
 class DeckEditorDatabaseDisplayWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp
index 37dd57459..4b141e255 100644
--- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp
@@ -2,75 +2,28 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../../client/settings/shortcuts_settings.h"
-#include "../../key_signals.h"
 #include "../../pixel_map_generator.h"
 #include "../playmat/playmat_settings_dialog.h"
-#include "../quick_settings/settings_button_widget.h"
-#include "../tabs/abstract_tab_deck_editor.h"
+#include "../settings_page/user_interface_settings_page.h"
 #include "../tabs/api/commander_spellbook/commander_bracket_widget.h"
-#include "../utility/custom_line_edit.h"
-#include "../visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h"
-#include "deck_list_history_manager_widget.h"
-#include "deck_list_model.h"
 #include "deck_list_style_proxy.h"
 #include "deck_state_manager.h"
 #include "deck_zone_dialog.h"
-#include "libcockatrice/card/card_info.h"
-#include "libcockatrice/card/database/card_database.h"
-#include "libcockatrice/card/database/card_database_loader.h"
-#include "libcockatrice/card/database/card_database_querier.h"
-#include "libcockatrice/card/printing/printing_info.h"
-#include "libcockatrice/deck_list/deck_list.h"
-#include "libcockatrice/deck_list/tree/abstract_deck_list_node.h"
-#include "libcockatrice/deck_list/tree/inner_deck_list_node.h"
-#include "libcockatrice/utility/card_ref.h"
-#include "libcockatrice/utility/playmat_params.h"
 
-#include <QAbstractItemModel>
-#include <QAbstractItemView>
-#include <QAction>
-#include <QCheckBox>
 #include <QComboBox>
-#include <QDebug>
-#include <QDialog>
 #include <QDockWidget>
-#include <QFlags>
-#include <QGridLayout>
 #include <QHeaderView>
-#include <QItemSelectionModel>
 #include <QLabel>
-#include <QList>
-#include <QMap>
-#include <QMenu>
 #include <QMessageBox>
-#include <QModelIndex>
-#include <QPair>
-#include <QPoint>
 #include <QPushButton>
-#include <QSet>
-#include <QSharedPointer>
-#include <QSize>
-#include <QSizePolicy>
 #include <QSplitter>
-#include <QStringList>
-#include <QStringLiteral>
 #include <QTextEdit>
-#include <QTimer>
-#include <QToolButton>
-#include <QVBoxLayout>
-#include <QVariant>
-#include <QWidget>
-#include <QtGlobal>
-#include <algorithm>
-#include <compare>
-#include <functional>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/deck_list/deck_list_node_tree.h>
 #include <libcockatrice/settings/deck_editor_settings.h>
+#include <libcockatrice/settings/interface_settings.h>
 #include <libcockatrice/utility/macros.h>
 #include <libcockatrice/utility/string_limits.h>
-#include <qnamespace.h>
-#include <utility>
 
 static int findRestoreIndex(const CardRef &wanted, const QComboBox *combo)
 {
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.h b/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.h
index 97ab8823e..1e5f4e677 100644
--- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.h
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.h
@@ -8,36 +8,27 @@
 #ifndef DECK_EDITOR_DECK_DOCK_WIDGET_H
 #define DECK_EDITOR_DECK_DOCK_WIDGET_H
 
+#include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
 #include "../../key_signals.h"
-#include "libcockatrice/card/printing/exact_card.h"
+#include "../utility/custom_line_edit.h"
+#include "../visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h"
+#include "deck_list_history_manager_widget.h"
+#include "deck_list_style_proxy.h"
 
+#include <QCheckBox>
+#include <QComboBox>
 #include <QDockWidget>
-#include <QModelIndexList>
-#include <QString>
+#include <QLabel>
+#include <QMenu>
+#include <QPushButton>
+#include <QTextEdit>
 #include <QTreeView>
-#include <qtmetamacros.h>
+#include <libcockatrice/card/card_info.h>
+#include <libcockatrice/deck_list/deck_list.h>
 
 class CommanderBracketWidget;
 class DeckListModel;
 class AbstractTabDeckEditor;
-class DeckListHistoryManagerWidget;
-class DeckListStyleProxy;
-class DeckPreviewDeckTagsDisplayWidget;
-class DeckStateManager;
-class LineEditUnfocusable;
-class QAction;
-class QCheckBox;
-class QComboBox;
-class QItemSelectionModel;
-class QLabel;
-class QMenu;
-class QModelIndex;
-class QPoint;
-class QPushButton;
-class QTextEdit;
-class QTimer;
-class SettingsButtonWidget;
-
 class DeckEditorDeckDockWidget : public QDockWidget
 {
     Q_OBJECT
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp
index 0a47333fa..c6b6e4416 100644
--- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp
@@ -4,31 +4,11 @@
 #include "../../../client/settings/shortcuts_settings.h"
 #include "../../../filters/filter_builder.h"
 #include "../../../filters/filter_tree_model.h"
-#include "../../key_signals.h"
 #include "../../pixel_map_generator.h"
-#include "../tabs/abstract_tab_deck_editor.h"
-#include "libcockatrice/filters/filter_card.h"
 
-#include <QAbstractItemModel>
-#include <QAction>
-#include <QDebug>
-#include <QFlags>
 #include <QGridLayout>
-#include <QItemSelectionModel>
-#include <QList>
 #include <QMenu>
-#include <QModelIndex>
-#include <QModelIndexList>
-#include <QPersistentModelIndex>
-#include <QPoint>
-#include <QString>
-#include <QStringLiteral>
 #include <QToolButton>
-#include <QTreeView>
-#include <QVBoxLayout>
-#include <QVariant>
-#include <QWidget>
-#include <qnamespace.h>
 
 DeckEditorFilterDockWidget::DeckEditorFilterDockWidget(AbstractTabDeckEditor *parent)
     : QDockWidget(parent), deckEditor(parent)
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.h b/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.h
index 7bb9c0045..b61fc72b5 100644
--- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.h
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.h
@@ -8,18 +8,13 @@
 #ifndef DECK_EDITOR_FILTER_DOCK_WIDGET_H
 #define DECK_EDITOR_FILTER_DOCK_WIDGET_H
 
+#include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
 #include "../../key_signals.h"
 
 #include <QDockWidget>
-#include <qtmetamacros.h>
 
 class FilterTreeModel;
 class AbstractTabDeckEditor;
-class QAction;
-class QPoint;
-class QTreeView;
-class QWidget;
-
 class DeckEditorFilterDockWidget : public QDockWidget
 {
     Q_OBJECT
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp
index d45e951ba..06d8d1de7 100644
--- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp
@@ -2,15 +2,10 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
-#include "../printing_selector/printing_selector.h"
-#include "deck_editor_deck_dock_widget.h"
 #include "printing_disabled_info_widget.h"
 
-#include <QFlags>
 #include <QVBoxLayout>
-#include <QWidget>
 #include <libcockatrice/settings/cards_display_settings.h>
-#include <qnamespace.h>
 
 DeckEditorPrintingSelectorDockWidget::DeckEditorPrintingSelectorDockWidget(AbstractTabDeckEditor *parent)
     : QDockWidget(parent), deckEditor(parent)
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.h b/cockatrice/src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.h
index e20ae932d..1037b55fb 100644
--- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.h
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.h
@@ -7,13 +7,13 @@
 #ifndef DECK_EDITOR_PRINTING_SELECTOR_DOCK_WIDGET_H
 #define DECK_EDITOR_PRINTING_SELECTOR_DOCK_WIDGET_H
 
+#include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
+#include "../printing_selector/printing_selector.h"
+
 #include <QDockWidget>
-#include <qtmetamacros.h>
 
 class PrintingDisabledInfoWidget;
-class AbstractTabDeckEditor;
-class PrintingSelector;
-class QWidget;
+class TabDeckEditor;
 
 class DeckEditorPrintingSelectorDockWidget : public QDockWidget
 {
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp
index 209dc7273..c93f12b34 100644
--- a/cockatrice/src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp
@@ -1,28 +1,7 @@
 #include "deck_list_history_manager_widget.h"
 
 #include "../../pixel_map_generator.h"
-#include "../quick_settings/settings_button_widget.h"
 #include "deck_state_manager.h"
-#include "libcockatrice/deck_list/deck_list_history_manager.h"
-#include "libcockatrice/deck_list/deck_list_memento.h"
-
-#include <QAction>
-#include <QBrush>
-#include <QFlags>
-#include <QHBoxLayout>
-#include <QKeySequence>
-#include <QLabel>
-#include <QListWidget>
-#include <QListWidgetItem>
-#include <QSharedPointer>
-#include <QStack>
-#include <QString>
-#include <QStringLiteral>
-#include <QToolButton>
-#include <QVariant>
-#include <qnamespace.h>
-
-class DeckListStyleProxy;
 
 DeckListHistoryManagerWidget::DeckListHistoryManagerWidget(DeckStateManager *_deckStateManager,
                                                            DeckListStyleProxy *_styleProxy,
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_list_history_manager_widget.h b/cockatrice/src/interface/widgets/deck_editor/deck_list_history_manager_widget.h
index 5ed44b0fd..ab53912e2 100644
--- a/cockatrice/src/interface/widgets/deck_editor/deck_list_history_manager_widget.h
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_list_history_manager_widget.h
@@ -1,20 +1,18 @@
 #ifndef COCKATRICE_DECK_EDITOR_DECK_LIST_HISTORY_MANAGER_WIDGET_H
 #define COCKATRICE_DECK_EDITOR_DECK_LIST_HISTORY_MANAGER_WIDGET_H
 
-#include <qtmetamacros.h>
-
-class DeckListStyleProxy;
-class QAction;
-class QHBoxLayout;
-class QLabel;
-class QListWidget;
-class QListWidgetItem;
-class QToolButton;
-class SettingsButtonWidget;
 #ifndef COCKATRICE_DECK_UNDO_WIDGET_H
 #define COCKATRICE_DECK_UNDO_WIDGET_H
 
+#include "../quick_settings/settings_button_widget.h"
+#include "deck_list_style_proxy.h"
+
+#include <QAction>
+#include <QHBoxLayout>
+#include <QListWidget>
 #include <QWidget>
+#include <libcockatrice/deck_list/deck_list_history_manager.h>
+#include <libcockatrice/models/deck_list/deck_list_model.h>
 
 class DeckStateManager;
 
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_list_style_proxy.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_list_style_proxy.cpp
index 1e1aefe58..e41529b22 100644
--- a/cockatrice/src/interface/widgets/deck_editor/deck_list_style_proxy.cpp
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_list_style_proxy.cpp
@@ -3,10 +3,7 @@
 #include <QBrush>
 #include <QColor>
 #include <QFont>
-#include <QModelIndex>
-#include <QVariant>
 #include <libcockatrice/models/deck_list/deck_list_model.h>
-#include <qnamespace.h>
 
 QVariant DeckListStyleProxy::data(const QModelIndex &index, int role) const
 {
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_list_style_proxy.h b/cockatrice/src/interface/widgets/deck_editor/deck_list_style_proxy.h
index e4d1de4f4..52b7eea10 100644
--- a/cockatrice/src/interface/widgets/deck_editor/deck_list_style_proxy.h
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_list_style_proxy.h
@@ -2,7 +2,6 @@
 #define COCKATRICE_DECK_LIST_STYLE_PROXY_H
 
 #include <QIdentityProxyModel>
-#include <qtmetamacros.h>
 
 class DeckListStyleProxy : public QIdentityProxyModel
 {
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_state_manager.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_state_manager.cpp
index d4715c8d5..cfe989e9f 100644
--- a/cockatrice/src/interface/widgets/deck_editor/deck_state_manager.cpp
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_state_manager.cpp
@@ -1,28 +1,11 @@
 #include "deck_state_manager.h"
 
 #include "../../../client/settings/cache_settings.h"
-#include "../../deck_loader/loaded_deck.h"
-#include "deck_list_model.h"
-#include "libcockatrice/card/card_info.h"
-#include "libcockatrice/card/database/card_database_querier.h"
-#include "libcockatrice/card/printing/exact_card.h"
-#include "libcockatrice/card/printing/printing_info.h"
-#include "libcockatrice/card/set/card_set.h"
-#include "libcockatrice/deck_list/deck_list.h"
-#include "libcockatrice/deck_list/deck_list_memento.h"
-#include "libcockatrice/deck_list/deck_list_node_tree.h"
-#include "libcockatrice/utility/card_ref.h"
-#include "libcockatrice/utility/playmat_params.h"
 
-#include <QList>
-#include <QVariant>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/deck_list/deck_list_history_manager.h>
 #include <libcockatrice/deck_list/tree/inner_deck_list_node.h>
 #include <libcockatrice/settings/cards_display_settings.h>
-#include <qnamespace.h>
-
-class QModelIndex;
 
 DeckStateManager::DeckStateManager(QObject *parent)
     : QObject(parent), deckList(QSharedPointer<DeckList>(new DeckList)),
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_state_manager.h b/cockatrice/src/interface/widgets/deck_editor/deck_state_manager.h
index 98876947b..2c8b34a39 100644
--- a/cockatrice/src/interface/widgets/deck_editor/deck_state_manager.h
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_state_manager.h
@@ -2,22 +2,13 @@
 #define COCKATRICE_DECK_STATE_MANAGER_H
 
 #include "../../deck_loader/loaded_deck.h"
+#include "deck_list_model.h"
 
-#include <QModelIndex>
-#include <QObject>
 #include <QSharedPointer>
-#include <QString>
-#include <QStringList>
 #include <functional>
 #include <libcockatrice/deck_list/deck_list.h>
-#include <qtmetamacros.h>
 
 class DeckListHistoryManager;
-class DeckListModel;
-class DecklistNodeTree;
-class ExactCard;
-struct CardRef;
-struct PlaymatInfo;
 
 /**
  * @brief This class centralizes the management of the state of the deck in the deck editor tab.
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_zone_dialog.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_zone_dialog.cpp
index cb9667603..9a0be2570 100644
--- a/cockatrice/src/interface/widgets/deck_editor/deck_zone_dialog.cpp
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_zone_dialog.cpp
@@ -2,14 +2,10 @@
 
 #include <QComboBox>
 #include <QDialogButtonBox>
-#include <QEvent>
-#include <QIcon>
 #include <QLabel>
 #include <QLineEdit>
-#include <QList>
 #include <QPushButton>
 #include <QVBoxLayout>
-#include <QVariant>
 #include <libcockatrice/deck_list/tree/inner_deck_list_node.h>
 #include <libcockatrice/utility/string_limits.h>
 
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_zone_dialog.h b/cockatrice/src/interface/widgets/deck_editor/deck_zone_dialog.h
index f4c9c0f9d..6f55617a8 100644
--- a/cockatrice/src/interface/widgets/deck_editor/deck_zone_dialog.h
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_zone_dialog.h
@@ -8,9 +8,9 @@
 #define DECK_ZONE_DIALOG_H
 
 #include <QDialog>
+#include <QEvent>
 #include <QString>
 #include <functional>
-#include <qtmetamacros.h>
 
 class QComboBox;
 class QDialogButtonBox;
diff --git a/cockatrice/src/interface/widgets/deck_editor/printing_disabled_info_widget.cpp b/cockatrice/src/interface/widgets/deck_editor/printing_disabled_info_widget.cpp
index b2c4dd303..23670b1b3 100644
--- a/cockatrice/src/interface/widgets/deck_editor/printing_disabled_info_widget.cpp
+++ b/cockatrice/src/interface/widgets/deck_editor/printing_disabled_info_widget.cpp
@@ -3,13 +3,10 @@
 #include "../dialogs/override_printing_warning.h"
 
 #include <QHBoxLayout>
-#include <QIcon>
 #include <QLabel>
 #include <QPushButton>
-#include <QSize>
 #include <QStyle>
-#include <QVBoxLayout>
-#include <qnamespace.h>
+#include <qguiapplication.h>
 
 PrintingDisabledInfoWidget::PrintingDisabledInfoWidget(QWidget *parent) : QWidget(parent)
 {
diff --git a/cockatrice/src/interface/widgets/deck_editor/printing_disabled_info_widget.h b/cockatrice/src/interface/widgets/deck_editor/printing_disabled_info_widget.h
index c14c758ff..0851ccfad 100644
--- a/cockatrice/src/interface/widgets/deck_editor/printing_disabled_info_widget.h
+++ b/cockatrice/src/interface/widgets/deck_editor/printing_disabled_info_widget.h
@@ -1,7 +1,6 @@
 #ifndef COCKATRICE_PRINTING_DISABLED_INFO_WIDGET_H
 #define COCKATRICE_PRINTING_DISABLED_INFO_WIDGET_H
 #include <QWidget>
-#include <qtmetamacros.h>
 
 class QPushButton;
 class QLabel;
diff --git a/cockatrice/src/interface/widgets/deck_share/deck_share_utils.cpp b/cockatrice/src/interface/widgets/deck_share/deck_share_utils.cpp
index 0ebdc0647..4343f0aab 100644
--- a/cockatrice/src/interface/widgets/deck_share/deck_share_utils.cpp
+++ b/cockatrice/src/interface/widgets/deck_share/deck_share_utils.cpp
@@ -3,11 +3,9 @@
 #include <QClipboard>
 #include <QGuiApplication>
 #include <QLocale>
-#include <QStringLiteral>
 #include <QTimeZone>
 #include <QUrl>
 #include <QUrlQuery>
-#include <QtGlobal>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/response.pb.h>
 #include <libcockatrice/protocol/pb/response_deck_share_create.pb.h>
diff --git a/cockatrice/src/interface/widgets/deck_share/share_bar_widget.h b/cockatrice/src/interface/widgets/deck_share/share_bar_widget.h
index f97cc6788..ede9fb41b 100644
--- a/cockatrice/src/interface/widgets/deck_share/share_bar_widget.h
+++ b/cockatrice/src/interface/widgets/deck_share/share_bar_widget.h
@@ -7,9 +7,7 @@
 #ifndef SHARE_BAR_WIDGET_H
 #define SHARE_BAR_WIDGET_H
 
-#include <QString>
 #include <QWidget>
-#include <qtmetamacros.h>
 
 class QLabel;
 class QLineEdit;
diff --git a/cockatrice/src/interface/widgets/deck_share/shared_deck_preview_widget.cpp b/cockatrice/src/interface/widgets/deck_share/shared_deck_preview_widget.cpp
index 3bb829089..21ec80e08 100644
--- a/cockatrice/src/interface/widgets/deck_share/shared_deck_preview_widget.cpp
+++ b/cockatrice/src/interface/widgets/deck_share/shared_deck_preview_widget.cpp
@@ -2,20 +2,14 @@
 
 #include "../cards/additional_info/color_identity_widget.h"
 #include "../cards/deck_preview_card_picture_widget.h"
-#include "libcockatrice/card/printing/exact_card.h"
-#include "libcockatrice/utility/card_ref.h"
 
 #include <QCheckBox>
-#include <QColor>
 #include <QFrame>
 #include <QHBoxLayout>
 #include <QKeyEvent>
 #include <QLabel>
-#include <QRect>
-#include <QStringLiteral>
 #include <QVBoxLayout>
 #include <libcockatrice/card/database/card_database_querier.h>
-#include <qnamespace.h>
 
 SharedDeckPreviewWidget::SharedDeckPreviewWidget(QWidget *parent,
                                                  const CardDatabaseQuerier *querier,
diff --git a/cockatrice/src/interface/widgets/deck_share/shared_deck_preview_widget.h b/cockatrice/src/interface/widgets/deck_share/shared_deck_preview_widget.h
index bff7de743..bd4c4ee5f 100644
--- a/cockatrice/src/interface/widgets/deck_share/shared_deck_preview_widget.h
+++ b/cockatrice/src/interface/widgets/deck_share/shared_deck_preview_widget.h
@@ -7,15 +7,15 @@
 #ifndef SHARED_DECK_PREVIEW_WIDGET_H
 #define SHARED_DECK_PREVIEW_WIDGET_H
 
-#include <QString>
 #include <QWidget>
-#include <qtmetamacros.h>
 
 class ColorIdentityWidget;
 class DeckPreviewCardPictureWidget;
 class QCheckBox;
 class QFrame;
+class QKeyEvent;
 class QLabel;
+class QResizeEvent;
 class CardDatabaseQuerier;
 
 /**
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_connect.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_connect.cpp
index 7a7e31a58..700012d45 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_connect.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_connect.cpp
@@ -2,34 +2,19 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../pixel_map_generator.h"
-#include "../server/handle_public_servers.h"
-#include "../server/user/user_info_connection.h"
-#include "libcockatrice/utility/macros.h"
 
 #include <QCheckBox>
 #include <QComboBox>
-#include <QDebug>
 #include <QDialogButtonBox>
 #include <QGridLayout>
 #include <QGroupBox>
-#include <QHBoxLayout>
-#include <QIntValidator>
+#include <QKeyEvent>
 #include <QLabel>
-#include <QList>
 #include <QMessageBox>
 #include <QPushButton>
 #include <QRadioButton>
-#include <QSharedPointer>
-#include <QSize>
-#include <QStringList>
-#include <QStringLiteral>
-#include <QVBoxLayout>
-#include <QtGlobal>
 #include <libcockatrice/settings/servers_settings.h>
 #include <libcockatrice/utility/string_limits.h>
-#include <qnamespace.h>
-
-class QWidget;
 
 DlgConnect::DlgConnect(QWidget *parent) : QDialog(parent)
 {
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_connect.h b/cockatrice/src/interface/widgets/dialogs/dlg_connect.h
index 10cb5366a..083dad0ad 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_connect.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_connect.h
@@ -7,13 +7,12 @@
 #ifndef DLG_CONNECT_H
 #define DLG_CONNECT_H
 
+#include "../interface/widgets/server/handle_public_servers.h"
+#include "../interface/widgets/server/user/user_info_connection.h"
+
 #include <QDialog>
 #include <QLineEdit>
-#include <QMap>
-#include <QString>
 #include <libcockatrice/utility/macros.h>
-#include <qtmetamacros.h>
-#include <utility>
 
 class QCheckBox;
 class QComboBox;
@@ -24,9 +23,6 @@ class QLabel;
 class QPushButton;
 class QRadioButton;
 class QVBoxLayout;
-class HandlePublicServers;
-class QWidget;
-class UserConnection_Information;
 
 class DlgConnect : public QDialog
 {
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp
index f2dd8c1e4..a4a31d78d 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp
@@ -1,7 +1,7 @@
 #include "dlg_convert_deck_to_cod_format.h"
 
 #include "../../../client/settings/cache_settings.h"
-#include "../../deck_loader/deck_file_format.h"
+#include "../../deck_loader/deck_loader.h"
 
 #include <QCheckBox>
 #include <QDialogButtonBox>
@@ -10,7 +10,6 @@
 #include <QFileInfo>
 #include <QLabel>
 #include <QMessageBox>
-#include <QObject>
 #include <QVBoxLayout>
 #include <libcockatrice/settings/visual_deck_storage_settings.h>
 
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.h b/cockatrice/src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.h
index de2fb9a63..526582135 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.h
@@ -8,17 +8,14 @@
 #ifndef DIALOG_CONVERT_DECK_TO_COD_FORMAT_H
 #define DIALOG_CONVERT_DECK_TO_COD_FORMAT_H
 
+#include <QCheckBox>
 #include <QDialog>
-#include <QString>
-#include <QtGlobal>
+#include <QDialogButtonBox>
+#include <QLabel>
+#include <QVBoxLayout>
 #include <functional>
-#include <qtmetamacros.h>
 
 class QWidget;
-class QCheckBox;
-class QDialogButtonBox;
-class QLabel;
-class QVBoxLayout;
 
 class DialogConvertDeckToCodFormat : public QDialog
 {
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_create_game.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_create_game.cpp
index 104b695e6..59f3e033d 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_create_game.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_create_game.cpp
@@ -2,35 +2,23 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../interface/widgets/tabs/tab_room.h"
-#include "libcockatrice/protocol/pb/response.pb.h"
-#include "libcockatrice/protocol/pb/room_commands.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_user.pb.h"
-#include "libcockatrice/utility/macros.h"
 
+#include <QApplication>
 #include <QCheckBox>
-#include <QDebug>
 #include <QDialogButtonBox>
 #include <QGridLayout>
 #include <QGroupBox>
 #include <QLabel>
 #include <QLineEdit>
-#include <QMapIterator>
 #include <QMessageBox>
 #include <QPushButton>
 #include <QRadioButton>
 #include <QSet>
-#include <QSharedPointer>
-#include <QSize>
 #include <QSpinBox>
-#include <QVBoxLayout>
 #include <libcockatrice/protocol/pb/serverinfo_game.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
 #include <libcockatrice/settings/game_settings.h>
 #include <libcockatrice/utility/string_limits.h>
-#include <qnamespace.h>
-#include <string>
-
-class QWidget;
 
 void DlgCreateGame::sharedCtor()
 {
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_create_game.h b/cockatrice/src/interface/widgets/dialogs/dlg_create_game.h
index 71b09997c..61925286d 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_create_game.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_create_game.h
@@ -9,9 +9,7 @@
 
 #include <QDialog>
 #include <QMap>
-#include <QString>
 #include <libcockatrice/utility/macros.h>
-#include <qtmetamacros.h>
 
 class QCheckBox;
 class QDialogButtonBox;
@@ -24,7 +22,6 @@ class QSpinBox;
 class Response;
 class ServerInfo_Game;
 class TabRoom;
-class QWidget;
 
 class DlgCreateGame : public QDialog
 {
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_default_tags_editor.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_default_tags_editor.cpp
index 9eb064beb..e9c73b025 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_default_tags_editor.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_default_tags_editor.cpp
@@ -2,20 +2,9 @@
 
 #include "../../../client/settings/cache_settings.h"
 
-#include <QAbstractItemView>
-#include <QHBoxLayout>
-#include <QLineEdit>
-#include <QList>
-#include <QListWidget>
-#include <QListWidgetItem>
 #include <QMessageBox>
 #include <QPushButton>
-#include <QSharedPointer>
-#include <QSizePolicy>
-#include <QString>
-#include <QStringList>
 #include <QVBoxLayout>
-#include <QWidget>
 #include <libcockatrice/settings/visual_deck_storage_settings.h>
 
 DlgDefaultTagsEditor::DlgDefaultTagsEditor(QWidget *parent) : QDialog(parent)
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_default_tags_editor.h b/cockatrice/src/interface/widgets/dialogs/dlg_default_tags_editor.h
index 081701485..e584d0731 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_default_tags_editor.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_default_tags_editor.h
@@ -9,15 +9,9 @@
 #define DLG_DEFAULT_TAGS_EDITOR_H
 
 #include <QDialog>
-#include <qtmetamacros.h>
-
-class QHBoxLayout;
-class QLineEdit;
-class QListWidget;
-class QListWidgetItem;
-class QPushButton;
-class QVBoxLayout;
-class QWidget;
+#include <QLineEdit>
+#include <QListWidget>
+#include <QVBoxLayout>
 
 class DlgDefaultTagsEditor : public QDialog
 {
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_edit_avatar.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_edit_avatar.cpp
index 520ece007..120e20f3e 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_edit_avatar.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_edit_avatar.cpp
@@ -3,22 +3,12 @@
 #include <QBuffer>
 #include <QDebug>
 #include <QDialogButtonBox>
-#include <QDir>
 #include <QFileDialog>
-#include <QGridLayout>
-#include <QIODevice>
 #include <QImageReader>
 #include <QLabel>
-#include <QMessageLogger>
-#include <QPixmap>
 #include <QPushButton>
-#include <QSize>
-#include <QString>
 #include <QVBoxLayout>
 #include <libcockatrice/utility/string_limits.h>
-#include <qnamespace.h>
-
-class QWidget;
 
 DlgEditAvatar::DlgEditAvatar(QWidget *parent) : QDialog(parent), image()
 {
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_edit_avatar.h b/cockatrice/src/interface/widgets/dialogs/dlg_edit_avatar.h
index 4df45711c..9ac774b24 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_edit_avatar.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_edit_avatar.h
@@ -7,18 +7,16 @@
 #ifndef DLG_EDITAVATAR_H
 #define DLG_EDITAVATAR_H
 
-#include <QByteArray>
+#include <QComboBox>
 #include <QDialog>
-#include <QImage>
+#include <QLineEdit>
 #include <QLoggingCategory>
-#include <qtmetamacros.h>
-
-class QWidget;
 
 inline Q_LOGGING_CATEGORY(DlgEditAvatarLog, "dlg_edit_avatar");
 
 class QLabel;
 class QPushButton;
+class QCheckBox;
 
 class DlgEditAvatar : public QDialog
 {
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_edit_password.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_edit_password.cpp
index 59f80c79c..4310c03fc 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_edit_password.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_edit_password.cpp
@@ -4,17 +4,12 @@
 
 #include <QDialogButtonBox>
 #include <QGridLayout>
+#include <QHBoxLayout>
 #include <QLabel>
 #include <QMessageBox>
-#include <QSharedPointer>
-#include <QSize>
-#include <QVBoxLayout>
 #include <libcockatrice/settings/servers_settings.h>
 #include <libcockatrice/utility/string_limits.h>
 
-class QVBoxLayout;
-class QWidget;
-
 DlgEditPassword::DlgEditPassword(QWidget *parent) : QDialog(parent)
 {
     oldPasswordLabel = new QLabel(tr("Old password:"));
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_edit_password.h b/cockatrice/src/interface/widgets/dialogs/dlg_edit_password.h
index e80ede3f3..85c72233d 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_edit_password.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_edit_password.h
@@ -9,11 +9,10 @@
 
 #include <QDialog>
 #include <QLineEdit>
-#include <QString>
-#include <qtmetamacros.h>
 
 class QLabel;
-class QWidget;
+class QPushButton;
+class QCheckBox;
 
 class DlgEditPassword : public QDialog
 {
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.cpp
index cbf61a394..a56aa8e35 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.cpp
@@ -2,41 +2,25 @@
 
 #include "../../pixel_map_generator.h"
 #include "../interface/widgets/utility/get_text_with_max.h"
-#include "card_database_display_model.h"
-#include "libcockatrice/card/card_info.h"
-#include "libcockatrice/card/database/card_database_querier.h"
-#include "libcockatrice/card/printing/printing_info.h"
-#include "libcockatrice/card/set/card_set.h"
 
 #include <QAction>
-#include <QChar>
 #include <QComboBox>
 #include <QDialogButtonBox>
 #include <QGridLayout>
 #include <QGroupBox>
 #include <QHBoxLayout>
-#include <QHash>
 #include <QHeaderView>
-#include <QItemSelectionModel>
+#include <QInputDialog>
 #include <QLabel>
 #include <QLineEdit>
 #include <QMessageBox>
-#include <QModelIndex>
-#include <QSharedPointer>
-#include <QStringLiteral>
 #include <QToolBar>
 #include <QTreeView>
-#include <QVBoxLayout>
-#include <QVariant>
-#include <QtGlobal>
 #include <libcockatrice/card/database/card_database.h>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/models/database/card_database_model.h>
 #include <libcockatrice/models/database/token/token_edit_model.h>
 #include <libcockatrice/utility/string_limits.h>
-#include <qnamespace.h>
-
-class QWidget;
 
 DlgEditTokens::DlgEditTokens(QWidget *parent) : QDialog(parent), currentCard(nullptr)
 {
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.h b/cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.h
index cde89d22b..202212e98 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.h
@@ -8,11 +8,7 @@
 #define DLG_EDIT_TOKENS_H
 
 #include <QDialog>
-#include <QList>
-#include <QString>
-#include <QStringList>
 #include <libcockatrice/card/card_info.h>
-#include <qtmetamacros.h>
 
 class QModelIndex;
 class CardDatabaseModel;
@@ -21,7 +17,6 @@ class QLabel;
 class QComboBox;
 class QLineEdit;
 class QTreeView;
-class QWidget;
 
 class DlgEditTokens : public QDialog
 {
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_edit_user.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_edit_user.cpp
index ffe8391a0..85b95f335 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_edit_user.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_edit_user.cpp
@@ -4,18 +4,10 @@
 
 #include <QDialogButtonBox>
 #include <QGridLayout>
+#include <QHBoxLayout>
 #include <QLabel>
-#include <QList>
-#include <QPixmap>
-#include <QSharedPointer>
-#include <QSize>
-#include <QStringList>
-#include <QVBoxLayout>
 #include <libcockatrice/utility/string_limits.h>
 
-class QVBoxLayout;
-class QWidget;
-
 DlgEditUser::DlgEditUser(QWidget *parent, QString email, QString country, QString realName) : QDialog(parent)
 {
     emailLabel = new QLabel(tr("Email:"));
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_edit_user.h b/cockatrice/src/interface/widgets/dialogs/dlg_edit_user.h
index 0385c2bbe..35a8bfb46 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_edit_user.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_edit_user.h
@@ -10,11 +10,10 @@
 #include <QComboBox>
 #include <QDialog>
 #include <QLineEdit>
-#include <QString>
-#include <qtmetamacros.h>
 
 class QLabel;
-class QWidget;
+class QPushButton;
+class QCheckBox;
 
 class DlgEditUser : public QDialog
 {
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_filter_games.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_filter_games.cpp
index cd3c3893e..7e174a228 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_filter_games.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_filter_games.cpp
@@ -1,25 +1,15 @@
 #include "dlg_filter_games.h"
 
-#include "../server/games_model.h"
-
 #include <QCheckBox>
 #include <QComboBox>
+#include <QCryptographicHash>
 #include <QDialogButtonBox>
 #include <QGridLayout>
 #include <QGroupBox>
-#include <QHBoxLayout>
 #include <QLabel>
 #include <QLineEdit>
-#include <QList>
-#include <QMapIterator>
-#include <QSharedPointer>
-#include <QSize>
+#include <QPushButton>
 #include <QSpinBox>
-#include <QVBoxLayout>
-#include <qnamespace.h>
-#include <utility>
-
-class QWidget;
 
 DlgFilterGames::DlgFilterGames(const QMap<int, QString> &_allGameTypes,
                                const GamesProxyModel *_gamesProxyModel,
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_filter_games.h b/cockatrice/src/interface/widgets/dialogs/dlg_filter_games.h
index d7c11d0f1..1cf822b89 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_filter_games.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_filter_games.h
@@ -7,23 +7,20 @@
 #ifndef DLG_FILTER_GAMES_H
 #define DLG_FILTER_GAMES_H
 
-#include "../server/game_filter_configs.h"
+#include "../interface/widgets/server/games_model.h"
 
+#include <QCheckBox>
+#include <QComboBox>
 #include <QDialog>
 #include <QMap>
 #include <QSet>
-#include <QString>
-#include <QStringList>
 #include <QTime>
-#include <qtmetamacros.h>
 
 class QCheckBox;
 class QComboBox;
 class QGroupBox;
 class QLineEdit;
 class QSpinBox;
-class GamesProxyModel;
-class QWidget;
 
 class DlgFilterGames : public QDialog
 {
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp
index 3ee74faab..c21955373 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp
@@ -4,16 +4,12 @@
 
 #include <QDialogButtonBox>
 #include <QGridLayout>
-#include <QIntValidator>
+#include <QHBoxLayout>
 #include <QLabel>
 #include <QMessageBox>
-#include <QSize>
-#include <QVBoxLayout>
 #include <libcockatrice/settings/servers_settings.h>
 #include <libcockatrice/utility/string_limits.h>
 
-class QWidget;
-
 DlgForgotPasswordChallenge::DlgForgotPasswordChallenge(QWidget *parent) : QDialog(parent)
 {
     QString lastfphost;
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_challenge.h b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_challenge.h
index f5678af17..d32e2fc3e 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_challenge.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_challenge.h
@@ -7,13 +7,13 @@
 #ifndef DLG_FORGOTPASSWORDCHALLENGE_H
 #define DLG_FORGOTPASSWORDCHALLENGE_H
 
+#include <QComboBox>
 #include <QDialog>
 #include <QLineEdit>
-#include <QString>
-#include <qtmetamacros.h>
 
 class QLabel;
-class QWidget;
+class QPushButton;
+class QCheckBox;
 
 class DlgForgotPasswordChallenge : public QDialog
 {
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_request.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_request.cpp
index 0cb1773b6..4ee0c9c88 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_request.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_request.cpp
@@ -4,16 +4,12 @@
 
 #include <QDialogButtonBox>
 #include <QGridLayout>
-#include <QIntValidator>
+#include <QHBoxLayout>
 #include <QLabel>
 #include <QMessageBox>
-#include <QSize>
-#include <QVBoxLayout>
 #include <libcockatrice/settings/servers_settings.h>
 #include <libcockatrice/utility/string_limits.h>
 
-class QWidget;
-
 DlgForgotPasswordRequest::DlgForgotPasswordRequest(QWidget *parent) : QDialog(parent)
 {
     QString lastfphost;
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_request.h b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_request.h
index ff255c748..2cf352e0d 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_request.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_request.h
@@ -7,13 +7,13 @@
 #ifndef DLG_FORGOTPASSWORDREQUEST_H
 #define DLG_FORGOTPASSWORDREQUEST_H
 
+#include <QComboBox>
 #include <QDialog>
 #include <QLineEdit>
-#include <QString>
-#include <qtmetamacros.h>
 
 class QLabel;
-class QWidget;
+class QPushButton;
+class QCheckBox;
 
 class DlgForgotPasswordRequest : public QDialog
 {
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp
index 6c1b95b43..2800d5c0c 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp
@@ -4,18 +4,12 @@
 
 #include <QDialogButtonBox>
 #include <QGridLayout>
-#include <QIntValidator>
+#include <QHBoxLayout>
 #include <QLabel>
 #include <QMessageBox>
-#include <QSharedPointer>
-#include <QSize>
-#include <QVBoxLayout>
 #include <libcockatrice/settings/servers_settings.h>
 #include <libcockatrice/utility/string_limits.h>
 
-class QVBoxLayout;
-class QWidget;
-
 DlgForgotPasswordReset::DlgForgotPasswordReset(QWidget *parent) : QDialog(parent)
 {
     QString lastfphost;
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_reset.h b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_reset.h
index 995d67359..8a443b906 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_reset.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_reset.h
@@ -7,13 +7,13 @@
 #ifndef DLG_FORGOTPASSWORDRESET_H
 #define DLG_FORGOTPASSWORDRESET_H
 
+#include <QComboBox>
 #include <QDialog>
 #include <QLineEdit>
-#include <QString>
-#include <qtmetamacros.h>
 
 class QLabel;
-class QWidget;
+class QPushButton;
+class QCheckBox;
 
 class DlgForgotPasswordReset : public QDialog
 {
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_invite_to_game.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_invite_to_game.cpp
index cf503856f..b5451bb2c 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_invite_to_game.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_invite_to_game.cpp
@@ -6,18 +6,13 @@
 
 #include <QGuiApplication>
 #include <QHBoxLayout>
+#include <QLabel>
 #include <QLineEdit>
 #include <QPushButton>
-#include <QRect>
 #include <QScreen>
-#include <QSize>
 #include <QUrl>
 #include <QUrlQuery>
 #include <QVBoxLayout>
-#include <QtGlobal>
-#include <functional>
-
-class QWidget;
 
 DlgInviteToGame::DlgInviteToGame(TabSupervisor *_tabSupervisor,
                                  const QString &_inviteUrl,
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_invite_to_game.h b/cockatrice/src/interface/widgets/dialogs/dlg_invite_to_game.h
index cfcc48733..bbb589bdb 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_invite_to_game.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_invite_to_game.h
@@ -8,16 +8,12 @@
 #define DLG_INVITE_TO_GAME_H
 
 #include <QDialog>
-#include <QList>
-#include <QString>
 #include <QStringList>
-#include <qtmetamacros.h>
 
 class QLineEdit;
 class QPushButton;
 class TabSupervisor;
 class UserListWidget;
-class QWidget;
 
 class DlgInviteToGame : public QDialog
 {
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck.cpp
index cbf24db87..626ebed50 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck.cpp
@@ -3,13 +3,8 @@
 #include "../../../client/settings/cache_settings.h"
 #include "../../deck_loader/deck_loader.h"
 
-#include <QDir>
-#include <QString>
 #include <libcockatrice/settings/paths_settings.h>
 #include <libcockatrice/settings/recents_settings.h>
-
-class QWidget;
-
 DlgLoadDeck::DlgLoadDeck(QWidget *parent) : QFileDialog(parent, tr("Load Deck"))
 {
     QString startingDir = SettingsCache::instance().recents().getLatestDeckDirPath();
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck.h b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck.h
index 5ba07c01d..27d658902 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck.h
@@ -9,9 +9,6 @@
 #define DLG_LOAD_DECK_H
 
 #include <QFileDialog>
-#include <qtmetamacros.h>
-
-class QWidget;
 
 /**
  * The file dialog for "Load Deck" operations.
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp
index 2c0fd3f6f..a3242c797 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp
@@ -9,19 +9,12 @@
 #include <QCheckBox>
 #include <QClipboard>
 #include <QDialogButtonBox>
-#include <QFlags>
-#include <QHBoxLayout>
-#include <QKeyEvent>
 #include <QMessageBox>
 #include <QPlainTextEdit>
 #include <QPushButton>
 #include <QTextStream>
 #include <QVBoxLayout>
-#include <functional>
 #include <libcockatrice/card/import/card_name_normalizer.h>
-#include <qnamespace.h>
-
-class QWidget;
 
 /**
  * Creates the main layout and connects the signals that are common to all versions of this window
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.h b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.h
index f3cbb7b62..dce9d712c 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.h
@@ -8,16 +8,13 @@
 #ifndef DLG_LOAD_DECK_FROM_CLIPBOARD_H
 #define DLG_LOAD_DECK_FROM_CLIPBOARD_H
 
-#include "libcockatrice/deck_list/deck_list.h"
+#include "../../deck_loader/loaded_deck.h"
 
+#include <QCheckBox>
 #include <QDialog>
-#include <QString>
-#include <qtmetamacros.h>
 
 class QPlainTextEdit;
 class QPushButton;
-class QCheckBox;
-class QWidget;
 
 /**
  * Base class for dialog windows for actions that involve loading decks from text input.
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp
index 88b7e2bb3..ba00873d9 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp
@@ -1,37 +1,16 @@
 #include "dlg_load_deck_from_website.h"
 
-#include "../../deck_loader/card_node_function.h"
-#include "parsers/deck_link_to_api_transformer.h"
-#include "parsers/interface_json_deck_parser.h"
-
 #include <QApplication>
-#include <QByteArray>
 #include <QClipboard>
-#include <QDebug>
 #include <QDialogButtonBox>
 #include <QEventLoop>
 #include <QJsonDocument>
 #include <QJsonObject>
-#include <QJsonParseError>
-#include <QLabel>
-#include <QLineEdit>
 #include <QMessageBox>
-#include <QMessageLogger>
-#include <QMetaObject>
-#include <QNetworkAccessManager>
 #include <QNetworkReply>
-#include <QNetworkRequest>
-#include <QString>
-#include <QTextStream>
-#include <QUrl>
-#include <QVBoxLayout>
-#include <functional>
 #include <libcockatrice/card/import/card_name_normalizer.h>
-#include <qnamespace.h>
 #include <version_string.h>
 
-class QWidget;
-
 DlgLoadDeckFromWebsite::DlgLoadDeckFromWebsite(QWidget *parent) : QDialog(parent)
 {
     nam = new QNetworkAccessManager(this);
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_website.h b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_website.h
index 3f6e759f2..2890148b9 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_website.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_website.h
@@ -8,21 +8,15 @@
 #ifndef DLG_LOAD_DECK_FROM_WEBSITE_H
 #define DLG_LOAD_DECK_FROM_WEBSITE_H
 
+#include "../client/network/parsers/deck_link_to_api_transformer.h"
 #include "../client/network/parsers/interface_json_deck_parser.h"
-#include "libcockatrice/deck_list/deck_list.h"
 
 #include <QDialog>
+#include <QLabel>
+#include <QLineEdit>
 #include <QLoggingCategory>
-#include <QSharedPointer>
-#include <qtmetamacros.h>
-
-class QLabel;
-class QLineEdit;
-class QNetworkAccessManager;
-class QVBoxLayout;
-class QWidget;
-enum class DeckProvider;
-template <class T> class QSharedPointer;
+#include <QNetworkAccessManager>
+#include <QVBoxLayout>
 
 inline Q_LOGGING_CATEGORY(DlgLoadDeckFromWebsiteLog, "dlg_load_deck_from_website");
 
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_load_remote_deck.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_load_remote_deck.cpp
index a56009fe4..ffe08bec9 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_load_remote_deck.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_load_remote_deck.cpp
@@ -3,13 +3,9 @@
 #include "../interface/widgets/server/remote/remote_decklist_tree_widget.h"
 
 #include <QDialogButtonBox>
-#include <QItemSelectionModel>
 #include <QPushButton>
-#include <QSize>
 #include <QVBoxLayout>
 
-class QWidget;
-
 DlgLoadRemoteDeck::DlgLoadRemoteDeck(AbstractClient *_client, QWidget *parent) : QDialog(parent), client(_client)
 {
     dirView = new RemoteDeckList_TreeWidget(client);
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_load_remote_deck.h b/cockatrice/src/interface/widgets/dialogs/dlg_load_remote_deck.h
index cfec16d90..9c81e9ae3 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_load_remote_deck.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_load_remote_deck.h
@@ -9,13 +9,12 @@
 #define DLG_STARTGAME_H
 
 #include <QDialog>
-#include <qtmetamacros.h>
 
 class RemoteDeckList_TreeWidget;
 class QModelIndex;
 class AbstractClient;
+class QPushButton;
 class QDialogButtonBox;
-class QWidget;
 
 class DlgLoadRemoteDeck : public QDialog
 {
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_local_game_options.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_local_game_options.cpp
index 858deb751..eca0ec658 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_local_game_options.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_local_game_options.cpp
@@ -7,13 +7,10 @@
 #include <QGridLayout>
 #include <QGroupBox>
 #include <QLabel>
-#include <QSize>
 #include <QSpinBox>
 #include <QVBoxLayout>
 #include <libcockatrice/settings/game_settings.h>
 
-class QWidget;
-
 DlgLocalGameOptions::DlgLocalGameOptions(QWidget *parent) : QDialog(parent)
 {
     numberPlayersLabel = new QLabel(tr("Players:"), this);
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_local_game_options.h b/cockatrice/src/interface/widgets/dialogs/dlg_local_game_options.h
index 0725a08db..4307581a4 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_local_game_options.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_local_game_options.h
@@ -11,9 +11,6 @@
 #define DLG_LOCAL_GAME_OPTIONS_H
 
 #include <QDialog>
-#include <qtmetamacros.h>
-
-class QWidget;
 
 struct LocalGameOptions
 {
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_login_prompt.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_login_prompt.cpp
index 0a18a759f..86647ef26 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_login_prompt.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_login_prompt.cpp
@@ -7,8 +7,6 @@
 #include <QLineEdit>
 #include <QVBoxLayout>
 
-class QWidget;
-
 DlgLoginPrompt::DlgLoginPrompt(const QString &serverText, QWidget *parent) : QDialog(parent)
 {
     setWindowTitle(tr("Sign in"));
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_login_prompt.h b/cockatrice/src/interface/widgets/dialogs/dlg_login_prompt.h
index 47bf3bcf4..e47924058 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_login_prompt.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_login_prompt.h
@@ -8,12 +8,9 @@
 #define DLG_LOGIN_PROMPT_H
 
 #include <QDialog>
-#include <QString>
-#include <qtmetamacros.h>
 
 class QCheckBox;
 class QLineEdit;
-class QWidget;
 
 /**
  * @brief Small sign-in dialog used when a cockatrice:// link needs credentials
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.cpp
index dbfe38e26..556c270be 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.cpp
@@ -4,42 +4,21 @@
 #include "../../pixel_map_generator.h"
 #include "../interface/card_picture_loader/card_picture_loader.h"
 #include "../interface/widgets/utility/custom_line_edit.h"
-#include "libcockatrice/card/database/card_database.h"
 
-#include <QAbstractButton>
-#include <QAbstractItemView>
-#include <QAbstractTableModel>
 #include <QAction>
-#include <QByteArray>
 #include <QCheckBox>
-#include <QDebug>
 #include <QDialogButtonBox>
 #include <QGridLayout>
 #include <QGroupBox>
 #include <QHBoxLayout>
 #include <QHeaderView>
-#include <QIcon>
 #include <QItemSelection>
-#include <QItemSelectionModel>
 #include <QLabel>
-#include <QList>
-#include <QModelIndex>
-#include <QModelIndexList>
 #include <QPushButton>
-#include <QSet>
-#include <QSharedPointer>
-#include <QSize>
-#include <QSizePolicy>
-#include <QSortFilterProxyModel>
-#include <QStringLiteral>
 #include <QToolBar>
 #include <QTreeView>
-#include <QWidget>
 #include <QtConcurrentRun>
-#include <QtGlobal>
 #include <algorithm>
-#include <compare>
-#include <functional>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/models/database/card_set/card_sets_model.h>
 #include <libcockatrice/settings/cards_display_settings.h>
@@ -178,6 +157,12 @@ WndSets::WndSets(QWidget *parent) : QMainWindow(parent)
     sortWarning->setLayout(sortWarningLayout);
     sortWarning->setVisible(false);
 
+    includeRebalancedCards = SettingsCache::instance().cardsDisplay().getIncludeRebalancedCards();
+    QCheckBox *includeRebalancedCardsCheckBox =
+        new QCheckBox(tr("Include cards rebalanced for Alchemy [requires restart]"));
+    includeRebalancedCardsCheckBox->setChecked(includeRebalancedCards);
+    connect(includeRebalancedCardsCheckBox, &QAbstractButton::toggled, this, &WndSets::includeRebalancedCardsChanged);
+
     buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
     connect(buttonBox, &QDialogButtonBox::accepted, this, &WndSets::actSave);
     connect(buttonBox, &QDialogButtonBox::rejected, this, &WndSets::actRestore);
@@ -191,8 +176,9 @@ WndSets::WndSets(QWidget *parent) : QMainWindow(parent)
     mainLayout->addWidget(enableSomeButton, 2, 1);
     mainLayout->addWidget(disableSomeButton, 2, 2);
     mainLayout->addWidget(sortWarning, 3, 1, 1, 2);
-    mainLayout->addWidget(hintsGroupBox, 4, 1, 1, 2);
-    mainLayout->addWidget(buttonBox, 5, 1, 1, 2);
+    mainLayout->addWidget(includeRebalancedCardsCheckBox, 4, 1, 1, 2);
+    mainLayout->addWidget(hintsGroupBox, 5, 1, 1, 2);
+    mainLayout->addWidget(buttonBox, 6, 1, 1, 2);
     mainLayout->setColumnStretch(1, 1);
     mainLayout->setColumnStretch(2, 1);
 
@@ -263,9 +249,15 @@ void WndSets::resetSort()
     sortWarning->setVisible(false);
 }
 
+void WndSets::includeRebalancedCardsChanged(bool _includeRebalancedCards)
+{
+    includeRebalancedCards = _includeRebalancedCards;
+}
+
 void WndSets::actSave()
 {
     model->save(CardDatabaseManager::getInstance());
+    SettingsCache::instance().cardsDisplay().setIncludeRebalancedCards(includeRebalancedCards);
     CardPictureLoader::clearPixmapCache();
     const auto reloadOk1 = QtConcurrent::run([] {
         CardDatabaseManager::getInstance()->reloadCardDatabasesAndNotify();
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.h b/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.h
index 67b4c90b1..2ed5eca0f 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.h
@@ -7,11 +7,12 @@
 #ifndef DLG_MANAGE_SETS_H
 #define DLG_MANAGE_SETS_H
 
+#include <QDialogButtonBox>
+#include <QGridLayout>
+#include <QLabel>
 #include <QMainWindow>
-#include <QString>
-#include <qnamespace.h>
-#include <qtmetamacros.h>
 
+class CardDatabase;
 class LineEditUnfocusable;
 class QGroupBox;
 class QItemSelection;
@@ -19,14 +20,7 @@ class QPushButton;
 class QTreeView;
 class SetsDisplayModel;
 class SetsModel;
-class QAction;
-class QDialogButtonBox;
-class QGridLayout;
-class QHBoxLayout;
-class QLabel;
-class QToolBar;
-class QWidget;
-template <class T> class QSet;
+class SetsProxyModel;
 
 class WndSets : public QMainWindow
 {
@@ -52,6 +46,7 @@ private:
     int sortIndex;
     Qt::SortOrder sortOrder;
     bool setOrderIsSorted;
+    bool includeRebalancedCards;
     enum
     {
         NO_SETS_SELECTED,
@@ -86,6 +81,7 @@ private slots:
     void actDisableResetButton(const QString &filterText);
     void actSort(int index);
     void actIgnoreWarning();
+    void includeRebalancedCardsChanged(bool _includeRebalancedCardsChanged);
 };
 
 #endif
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_my_reports.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_my_reports.cpp
index 52c9eaef0..1af83bfb5 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_my_reports.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_my_reports.cpp
@@ -2,11 +2,7 @@
 
 #include "../utility/report_utils.h"
 #include "abstract_client.h"
-#include "libcockatrice/protocol/pb/response.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_report.pb.h"
 
-#include <QAbstractItemView>
-#include <QFont>
 #include <QFontDatabase>
 #include <QGroupBox>
 #include <QHBoxLayout>
@@ -14,22 +10,16 @@
 #include <QLabel>
 #include <QLineEdit>
 #include <QPushButton>
-#include <QSharedPointer>
+#include <QSplitter>
 #include <QTableWidget>
-#include <QTableWidgetItem>
 #include <QTextEdit>
 #include <QVBoxLayout>
-#include <QVariant>
 #include <libcockatrice/protocol/pb/command_report_add_comment.pb.h>
 #include <libcockatrice/protocol/pb/command_report_details.pb.h>
 #include <libcockatrice/protocol/pb/command_report_my_list.pb.h>
 #include <libcockatrice/protocol/pb/response_report_details.pb.h>
 #include <libcockatrice/protocol/pb/response_report_my_list.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
-#include <qnamespace.h>
-#include <string>
-
-class QWidget;
 
 namespace
 {
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_my_reports.h b/cockatrice/src/interface/widgets/dialogs/dlg_my_reports.h
index dc9f90d2d..09b1963dd 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_my_reports.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_my_reports.h
@@ -3,9 +3,8 @@
 
 #include <QDialog>
 #include <QList>
-#include <QString>
+#include <libcockatrice/protocol/pb/response.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_report.pb.h>
-#include <qtmetamacros.h>
 
 class AbstractClient;
 class QTableWidget;
@@ -13,8 +12,6 @@ class QTextEdit;
 class QLineEdit;
 class QPushButton;
 class QLabel;
-class QWidget;
-class Response;
 
 class DlgMyReports : public QDialog
 {
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_register.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_register.cpp
index 9e32e87d1..6d022861c 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_register.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_register.cpp
@@ -10,23 +10,14 @@
 #include <QGridLayout>
 #include <QGroupBox>
 #include <QHBoxLayout>
-#include <QIntValidator>
 #include <QLabel>
-#include <QList>
 #include <QMessageBox>
-#include <QPixmap>
 #include <QPushButton>
 #include <QRadioButton>
-#include <QSharedPointer>
-#include <QStringList>
-#include <QStringLiteral>
 #include <QVBoxLayout>
-#include <QtGlobal>
 #include <libcockatrice/settings/servers_settings.h>
 #include <libcockatrice/utility/string_limits.h>
 
-class QWidget;
-
 DlgRegister::DlgRegister(QWidget *parent) : QDialog(parent)
 {
     // ── Server picker ──────────────────────────────────────────────────
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_register.h b/cockatrice/src/interface/widgets/dialogs/dlg_register.h
index 10ea98543..ce14eb427 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_register.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_register.h
@@ -5,16 +5,12 @@
 #include <QDialog>
 #include <QLineEdit>
 #include <QMap>
-#include <QString>
-#include <qtmetamacros.h>
-#include <utility>
 
 class HandlePublicServers;
 class QLabel;
 class QPushButton;
 class QRadioButton;
 class UserConnection_Information;
-class QWidget;
 
 class DlgRegister : public QDialog
 {
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_report_user.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_report_user.cpp
index b1ae479fe..7b855af96 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_report_user.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_report_user.cpp
@@ -1,31 +1,21 @@
 #include "dlg_report_user.h"
 
 #include "abstract_client.h"
-#include "libcockatrice/protocol/pb/response.pb.h"
 
 #include <QComboBox>
 #include <QDialogButtonBox>
-#include <QFont>
 #include <QFontDatabase>
 #include <QGridLayout>
 #include <QGroupBox>
 #include <QLabel>
-#include <QLatin1String>
 #include <QLineEdit>
-#include <QList>
 #include <QMessageBox>
 #include <QPushButton>
-#include <QSharedPointer>
 #include <QTextEdit>
 #include <QVBoxLayout>
-#include <QVariant>
 #include <libcockatrice/protocol/pb/command_report.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
 #include <libcockatrice/utility/report_categories.h>
-#include <qnamespace.h>
-#include <string>
-
-class QWidget;
 
 DlgReportUser::DlgReportUser(AbstractClient *_client,
                              const QString &_reportedUser,
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_report_user.h b/cockatrice/src/interface/widgets/dialogs/dlg_report_user.h
index c7fce055d..f8d5938ce 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_report_user.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_report_user.h
@@ -2,8 +2,7 @@
 #define COCKATRICE_DLG_REPORT_USER_H
 
 #include <QDialog>
-#include <QString>
-#include <qtmetamacros.h>
+#include <libcockatrice/protocol/pb/response.pb.h>
 
 class AbstractClient;
 class QComboBox;
@@ -11,8 +10,6 @@ class QDialogButtonBox;
 class QLineEdit;
 class QTextEdit;
 class QLabel;
-class QWidget;
-class Response;
 
 class DlgReportUser : public QDialog
 {
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp
index 55c6569f7..8eed083e1 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp
@@ -1,59 +1,26 @@
 #include "dlg_select_set_for_cards.h"
 
 #include "../../deck_loader/card_node_function.h"
+#include "../../deck_loader/deck_loader.h"
 #include "../deck_editor/deck_state_manager.h"
 #include "../interface/widgets/cards/card_info_picture_widget.h"
 #include "../interface/widgets/general/layout_containers/flow_widget.h"
-#include "deck_list_model.h"
-#include "libcockatrice/card/card_info.h"
-#include "libcockatrice/card/database/card_database.h"
-#include "libcockatrice/card/database/card_database_querier.h"
-#include "libcockatrice/card/printing/exact_card.h"
-#include "libcockatrice/card/printing/printing_info.h"
-#include "libcockatrice/card/set/card_set.h"
-#include "libcockatrice/deck_list/tree/inner_deck_list_node.h"
 
-#include <QBrush>
-#include <QByteArray>
 #include <QCheckBox>
-#include <QColor>
 #include <QDialogButtonBox>
-#include <QDrag>
-#include <QDragEnterEvent>
-#include <QDragMoveEvent>
-#include <QDropEvent>
-#include <QHBoxLayout>
-#include <QImage>
 #include <QLabel>
-#include <QLayoutItem>
+#include <QMessageBox>
 #include <QMimeData>
-#include <QModelIndex>
-#include <QMouseEvent>
-#include <QObject>
 #include <QPainter>
-#include <QPair>
-#include <QPixmap>
-#include <QPoint>
-#include <QPointF>
 #include <QPushButton>
-#include <QRect>
-#include <QScrollArea>
 #include <QScrollBar>
-#include <QSet>
-#include <QSharedPointer>
-#include <QSizePolicy>
 #include <QSplitter>
 #include <QTimer>
 #include <QVBoxLayout>
-#include <QVariant>
-#include <QVector>
 #include <algorithm>
-#include <functional>
 #include <libcockatrice/card/database/card_database_manager.h>
-#include <qalgorithms.h>
-#include <qnamespace.h>
-#include <qobjectdefs.h>
-#include <utility>
+#include <qdrag.h>
+#include <qevent.h>
 
 DlgSelectSetForCards::DlgSelectSetForCards(QWidget *parent, DeckStateManager *deckStateManger)
     : QDialog(parent), deckStateManager(deckStateManger)
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.h b/cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.h
index 89cc43662..4528552d0 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.h
@@ -7,23 +7,19 @@
 #ifndef DLG_SELECT_SET_FOR_CARDS_H
 #define DLG_SELECT_SET_FOR_CARDS_H
 
+#include "../interface/widgets/general/layout_containers/flow_widget.h"
+
+#include <QCheckBox>
 #include <QDialog>
-#include <QList>
+#include <QLabel>
+#include <QListWidget>
 #include <QMap>
-#include <QString>
-#include <QStringList>
-#include <QWidget>
-#include <qtmetamacros.h>
+#include <QScrollArea>
+#include <QVBoxLayout>
+#include <libcockatrice/models/deck_list/deck_list_model.h>
 
 class DeckStateManager;
 class SetEntryWidget; // Forward declaration
-class FlowWidget;
-class QCheckBox;
-class QLabel;
-class QListWidget;
-class QPushButton;
-class QScrollArea;
-class QVBoxLayout;
 
 class DlgSelectSetForCards : public QDialog
 {
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_settings.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_settings.cpp
index d41c948eb..581920dbc 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_settings.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_settings.cpp
@@ -8,7 +8,6 @@
 #include "../../../client/settings/cache_settings.h"
 #include "../../pixel_map_generator.h"
 #include "../main.h"
-#include "../settings_page/abstract_settings_page.h"
 #include "../settings_page/appearance_settings_page.h"
 #include "../settings_page/deck_editor_settings_page.h"
 #include "../settings_page/general_settings_page.h"
@@ -19,59 +18,33 @@
 #include "../settings_page/sound_settings_page.h"
 #include "../settings_page/storage_settings_page.h"
 #include "../settings_page/user_interface_settings_page.h"
-#include "libcockatrice/card/database/card_database.h"
 #include "libcockatrice/card/database/card_database_loader.h"
 #include "libcockatrice/card/database/card_database_manager.h"
 
-#include <QAbstractAnimation>
 #include <QAbstractItemView>
-#include <QApplication>
-#include <QBrush>
-#include <QByteArray>
 #include <QCloseEvent>
-#include <QColor>
-#include <QDebug>
 #include <QDir>
-#include <QEasingCurve>
-#include <QEvent>
-#include <QFlags>
 #include <QFrame>
 #include <QGraphicsOpacityEffect>
 #include <QGuiApplication>
 #include <QHBoxLayout>
-#include <QIcon>
 #include <QKeyEvent>
-#include <QKeySequence>
 #include <QLineEdit>
 #include <QListView>
 #include <QMessageBox>
-#include <QMessageLogger>
-#include <QModelIndex>
-#include <QObject>
-#include <QPalette>
-#include <QPixmap>
 #include <QPropertyAnimation>
 #include <QPushButton>
-#include <QRect>
 #include <QScreen>
 #include <QScrollArea>
 #include <QScrollBar>
 #include <QSequentialAnimationGroup>
 #include <QShortcut>
-#include <QSize>
-#include <QSizePolicy>
 #include <QStackedLayout>
 #include <QStackedWidget>
-#include <QStringLiteral>
 #include <QToolButton>
 #include <QVBoxLayout>
-#include <QWidget>
-#include <QtGlobal>
 #include <libcockatrice/settings/paths_settings.h>
 #include <libcockatrice/settings/personal_settings.h>
-#include <qnamespace.h>
-
-class QModelIndex;
 
 /**
  * @brief Wraps a widget in a scroll area for long settings pages
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_settings.h b/cockatrice/src/interface/widgets/dialogs/dlg_settings.h
index 1f15e76d5..845c0b4d6 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_settings.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_settings.h
@@ -7,15 +7,9 @@
 #define DLG_SETTINGS_H
 
 #include <QDialog>
-#include <QList>
 #include <QLoggingCategory>
-#include <QString>
-#include <QStringList>
-#include <qtmetamacros.h>
 
 class QPushButton;
-class QModelIndex;
-class QWidget;
 
 inline Q_LOGGING_CATEGORY(DlgSettingsLog, "dlg_settings");
 
@@ -23,6 +17,7 @@ class QStackedWidget;
 class QToolButton;
 class QListView;
 class QLineEdit;
+
 class AbstractSettingsPage;
 class SettingsSearchModel;
 class SettingsSearchDelegate;
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_share_deck.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_share_deck.cpp
index eec80a7e8..897d32062 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_share_deck.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_share_deck.cpp
@@ -9,21 +9,16 @@
 #include <QLineEdit>
 #include <QMessageBox>
 #include <QPushButton>
-#include <QString>
 #include <QTimer>
 #include <QVBoxLayout>
-#include <QtGlobal>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/deck_list/deck_list.h>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/command_deck_share_create.pb.h>
 #include <libcockatrice/protocol/pb/response.pb.h>
+#include <libcockatrice/protocol/pb/response_deck_share_create.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
 #include <libcockatrice/settings/network_settings.h>
-#include <string>
-
-class QWidget;
-template <class T> class QSharedPointer;
 
 DlgShareDeck::DlgShareDeck(AbstractClient *_client, const QSharedPointer<DeckList> &_deck, QWidget *_parent)
     : QDialog(_parent), client(_client), deck(_deck), shareTimeoutTimer(new QTimer(this))
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_share_deck.h b/cockatrice/src/interface/widgets/dialogs/dlg_share_deck.h
index 108a8c38b..162fa3677 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_share_deck.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_share_deck.h
@@ -9,7 +9,6 @@
 
 #include <QDialog>
 #include <QSharedPointer>
-#include <qtmetamacros.h>
 
 class AbstractClient;
 class CommandContainer;
@@ -18,8 +17,6 @@ class QDialogButtonBox;
 class QLineEdit;
 class QTimer;
 class Response;
-class QWidget;
-template <class T> class QSharedPointer;
 
 /**
  * @brief Slim dialog to create a temporary share for the deck open in the editor.
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_shared_decks_preview.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_shared_decks_preview.cpp
index 8ad91dcaf..cd7ecdcdd 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_shared_decks_preview.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_shared_decks_preview.cpp
@@ -3,19 +3,14 @@
 #include "../deck_share/shared_deck_preview_widget.h"
 #include "../general/layout_containers/flow_widget.h"
 
-#include <QAbstractButton>
+#include <QCloseEvent>
 #include <QDateTime>
 #include <QDialogButtonBox>
-#include <QFont>
 #include <QLabel>
 #include <QPushButton>
-#include <QStringList>
 #include <QVBoxLayout>
-#include <google/protobuf/repeated_ptr_field.h>
+#include <libcockatrice/card/database/card_database_querier.h>
 #include <libcockatrice/protocol/pb/serverinfo_deck_share_item.pb.h>
-#include <qnamespace.h>
-
-class QWidget;
 
 DlgSharedDecksPreview::DlgSharedDecksPreview(QWidget *parent,
                                              const CardDatabaseQuerier *querier,
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_shared_decks_preview.h b/cockatrice/src/interface/widgets/dialogs/dlg_shared_decks_preview.h
index fab7ba6bf..31820e3a0 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_shared_decks_preview.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_shared_decks_preview.h
@@ -3,17 +3,14 @@
 
 #include <QDialog>
 #include <QList>
-#include <QString>
-#include <QtGlobal>
-#include <qtmetamacros.h>
 
 class FlowWidget;
+class QCloseEvent;
 class QLabel;
 class QPushButton;
 class ServerInfo_DeckShareItem;
 class SharedDeckPreviewWidget;
 class CardDatabaseQuerier;
-class QWidget;
 
 /**
  * @brief Non-modal preview of the decks contained in a shared-deck link.
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_startup_card_check.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_startup_card_check.cpp
index 3d50480cc..4322beb8c 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_startup_card_check.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_startup_card_check.cpp
@@ -2,17 +2,9 @@
 
 #include "../../../client/settings/cache_settings.h"
 
-#include <QButtonGroup>
 #include <QDate>
-#include <QDialogButtonBox>
-#include <QLabel>
-#include <QRadioButton>
-#include <QString>
-#include <QVBoxLayout>
 #include <libcockatrice/settings/updates_settings.h>
 
-class QWidget;
-
 DlgStartupCardCheck::DlgStartupCardCheck(QWidget *parent) : QDialog(parent)
 {
     setWindowTitle(tr("Card Update Check"));
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_startup_card_check.h b/cockatrice/src/interface/widgets/dialogs/dlg_startup_card_check.h
index 0d0fb6670..d26610983 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_startup_card_check.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_startup_card_check.h
@@ -7,15 +7,12 @@
 #ifndef DLG_STARTUP_CARD_CHECK_H
 #define DLG_STARTUP_CARD_CHECK_H
 
+#include <QButtonGroup>
 #include <QDialog>
-#include <qtmetamacros.h>
-
-class QButtonGroup;
-class QDialogButtonBox;
-class QLabel;
-class QRadioButton;
-class QVBoxLayout;
-class QWidget;
+#include <QDialogButtonBox>
+#include <QLabel>
+#include <QRadioButton>
+#include <QVBoxLayout>
 
 class DlgStartupCardCheck : public QDialog
 {
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp
index 511ff1c7d..3d3619bf0 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp
@@ -7,19 +7,9 @@
 #include <QDate>
 #include <QDebug>
 #include <QDialogButtonBox>
-#include <QHBoxLayout>
 #include <QLabel>
-#include <QList>
-#include <QMessageLogger>
-#include <QPixmap>
 #include <QPushButton>
-#include <QSizePolicy>
-#include <QString>
-#include <QVBoxLayout>
-#include <QWidget>
-#include <algorithm>
 #include <libcockatrice/settings/personal_settings.h>
-#include <qnamespace.h>
 
 #define MIN_TIP_IMAGE_HEIGHT 200
 #define MIN_TIP_IMAGE_WIDTH 200
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_tip_of_the_day.h b/cockatrice/src/interface/widgets/dialogs/dlg_tip_of_the_day.h
index 689814115..e493481d0 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_tip_of_the_day.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_tip_of_the_day.h
@@ -7,15 +7,12 @@
 #ifndef DLG_TIPOFDAY_H
 #define DLG_TIPOFDAY_H
 
+#include <QComboBox>
 #include <QDialog>
+#include <QDialogButtonBox>
+#include <QLineEdit>
 #include <QLoggingCategory>
-#include <qtmetamacros.h>
-
-class QDialogButtonBox;
-class QHBoxLayout;
-class QPixmap;
-class QVBoxLayout;
-class QWidget;
+#include <QVBoxLayout>
 
 inline Q_LOGGING_CATEGORY(DlgTipOfTheDayLog, "dlg_tip_of_the_day");
 
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_update.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_update.cpp
index 76bb13248..bac270580 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_update.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_update.cpp
@@ -4,33 +4,18 @@
 #include "../client/network/update/client/client_update_checker.h"
 #include "../client/network/update/client/release_channel.h"
 #include "../interface/window_main.h"
-#include "update/client/update_downloader.h"
 
-#include <QApplication>
-#include <QByteArray>
 #include <QCoreApplication>
-#include <QDate>
-#include <QDebug>
 #include <QDesktopServices>
-#include <QDialogButtonBox>
 #include <QDir>
 #include <QFileInfo>
 #include <QLabel>
-#include <QList>
-#include <QLocale>
 #include <QMessageBox>
-#include <QMessageLogger>
-#include <QObject>
-#include <QProcess>
 #include <QProgressBar>
 #include <QPushButton>
-#include <QSize>
-#include <QSizePolicy>
-#include <QSslSocket>
 #include <QTimer>
 #include <QVBoxLayout>
-#include <QWidget>
-#include <qnamespace.h>
+#include <QtNetwork>
 #include <version_string.h>
 
 // Executable that, when it sits next to the downloaded update installer, is installed instead of
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_update.h b/cockatrice/src/interface/widgets/dialogs/dlg_update.h
index 026a54a8c..2cef46e70 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_update.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_update.h
@@ -7,24 +7,17 @@
 #ifndef DLG_UPDATE_H
 #define DLG_UPDATE_H
 
-#include "../../../client/network/update/client/release_channel.h"
+#include "../client/network/update/client/update_downloader.h"
 
-#include <QDialog>
+#include <QDialogButtonBox>
 #include <QLoggingCategory>
-#include <QString>
-#include <QUrl>
-#include <QtGlobal>
-#include <qtmetamacros.h>
-
-class QDialogButtonBox;
-class QLabel;
-class QProgressBar;
-class QPushButton;
-class QWidget;
-class UpdateDownloader;
+#include <QProgressDialog>
+#include <QtNetwork>
 
 inline Q_LOGGING_CATEGORY(DlgUpdateLog, "dlg_update");
 
+class Release;
+
 class DlgUpdate : public QDialog
 {
     Q_OBJECT
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_view_log.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_view_log.cpp
index d55e800a1..957e039c0 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_view_log.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_view_log.cpp
@@ -4,18 +4,13 @@
 #include "../../logger.h"
 
 #include <QApplication>
-#include <QCheckBox>
 #include <QClipboard>
-#include <QHBoxLayout>
-#include <QList>
 #include <QPlainTextEdit>
 #include <QPushButton>
 #include <QRegularExpression>
 #include <QVBoxLayout>
 #include <libcockatrice/settings/servers_settings.h>
 
-class QWidget;
-
 DlgViewLog::DlgViewLog(QWidget *parent) : QDialog(parent)
 {
     logArea = new QPlainTextEdit;
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_view_log.h b/cockatrice/src/interface/widgets/dialogs/dlg_view_log.h
index d63ff5ffc..5c7315b50 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_view_log.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_view_log.h
@@ -7,14 +7,11 @@
 #ifndef DLG_VIEWLOG_H
 #define DLG_VIEWLOG_H
 
+#include <QCheckBox>
 #include <QDialog>
-#include <QString>
-#include <qtmetamacros.h>
 
 class QPlainTextEdit;
-class QCheckBox;
-class QPushButton;
-class QWidget;
+class QCloseEvent;
 
 class DlgViewLog : public QDialog
 {
diff --git a/cockatrice/src/interface/widgets/dialogs/override_printing_warning.cpp b/cockatrice/src/interface/widgets/dialogs/override_printing_warning.cpp
index 57f7ff7f5..33d102f5e 100644
--- a/cockatrice/src/interface/widgets/dialogs/override_printing_warning.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/override_printing_warning.cpp
@@ -3,13 +3,7 @@
 #include "../../card_picture_loader/card_picture_loader.h"
 #include "../../client/settings/cache_settings.h"
 
-#include <QMessageBox>
-#include <QObject>
-#include <QString>
 #include <libcockatrice/settings/cards_display_settings.h>
-
-class QWidget;
-
 bool OverridePrintingWarning::execMessageBox(QWidget *parent, bool enable)
 {
     QString message;
diff --git a/cockatrice/src/interface/widgets/dialogs/override_printing_warning.h b/cockatrice/src/interface/widgets/dialogs/override_printing_warning.h
index 6c5891373..f2c926fc3 100644
--- a/cockatrice/src/interface/widgets/dialogs/override_printing_warning.h
+++ b/cockatrice/src/interface/widgets/dialogs/override_printing_warning.h
@@ -1,7 +1,6 @@
 #ifndef COCKATRICE_OVERRIDE_PRINTING_WARN_H
 #define COCKATRICE_OVERRIDE_PRINTING_WARN_H
-
-class QWidget;
+#include <QMessageBox>
 
 namespace OverridePrintingWarning
 {
diff --git a/cockatrice/src/interface/widgets/dialogs/path_safety_warning.cpp b/cockatrice/src/interface/widgets/dialogs/path_safety_warning.cpp
deleted file mode 100644
index d8eabd72d..000000000
--- a/cockatrice/src/interface/widgets/dialogs/path_safety_warning.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-#include "path_safety_warning.h"
-
-#include "../../client/settings/cache_settings.h"
-
-#include <QCoreApplication>
-#include <QMessageBox>
-#include <QObject>
-#include <QString>
-#include <libcockatrice/settings/paths_settings.h>
-
-class QWidget;
-
-bool PathSafetyWarning::confirmOutsideProgramDir(QWidget *parent, const QString &path)
-{
-    if (SettingsCache::instance().getIsPortableBuild()) {
-        return true;
-    }
-
-    if (!PathsSettings::isInsideDir(path, QCoreApplication::applicationDirPath())) {
-        return true;
-    }
-
-    QMessageBox box(QMessageBox::Warning, QObject::tr("Path inside the program directory"),
-                    QObject::tr("'%1' is inside the Cockatrice program directory.\n\n"
-                                "Files stored there can be deleted by an update or by uninstalling "
-                                "Cockatrice, so this change was not applied. Choose a location outside "
-                                "the program directory.")
-                        .arg(path),
-                    QMessageBox::Ok, parent);
-    box.setTextFormat(Qt::PlainText);
-    box.exec();
-
-    return false;
-}
diff --git a/cockatrice/src/interface/widgets/dialogs/path_safety_warning.h b/cockatrice/src/interface/widgets/dialogs/path_safety_warning.h
deleted file mode 100644
index 058df3e4b..000000000
--- a/cockatrice/src/interface/widgets/dialogs/path_safety_warning.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef COCKATRICE_PATH_SAFETY_WARNING_H
-#define COCKATRICE_PATH_SAFETY_WARNING_H
-
-class QString;
-class QWidget;
-
-namespace PathSafetyWarning
-{
-
-/**
- * @brief Warns when the user tries to configure a data path inside the program directory.
- *
- * Shows a message box explaining that files kept there can be deleted by an
- * update or by uninstalling Cockatrice. Portable builds are always exempt:
- * their data lives beside the executables by design.
- *
- * @param parent The parent widget
- * @param path The path the user is trying to configure
- * @return true when the path is outside the program directory and safe to apply
- */
-bool confirmOutsideProgramDir(QWidget *parent, const QString &path);
-
-} // namespace PathSafetyWarning
-
-#endif // COCKATRICE_PATH_SAFETY_WARNING_H
diff --git a/cockatrice/src/interface/widgets/dialogs/tip_of_the_day.cpp b/cockatrice/src/interface/widgets/dialogs/tip_of_the_day.cpp
index 3463fe6df..66170792a 100644
--- a/cockatrice/src/interface/widgets/dialogs/tip_of_the_day.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/tip_of_the_day.cpp
@@ -2,20 +2,11 @@
 
 #include <QDate>
 #include <QFile>
-#include <QIODevice>
-#include <QList>
-#include <QSharedPointer>
-#include <QStringView>
+#include <QMessageBox>
 #include <QTextStream>
-#include <QVariant>
 #include <QXmlStreamReader>
-#include <QtGlobal>
-#include <qnamespace.h>
-#include <stdio.h>
 #include <utility>
 
-class QObject;
-
 #define TIPDDBMODEL_COLUMNS 3
 
 TipOfTheDay::TipOfTheDay(QString _title, QString _content, QString _imagePath, QDate _date)
diff --git a/cockatrice/src/interface/widgets/dialogs/tip_of_the_day.h b/cockatrice/src/interface/widgets/dialogs/tip_of_the_day.h
index 4e6e23567..9cda07e2b 100644
--- a/cockatrice/src/interface/widgets/dialogs/tip_of_the_day.h
+++ b/cockatrice/src/interface/widgets/dialogs/tip_of_the_day.h
@@ -9,12 +9,6 @@
 
 #include <QAbstractListModel>
 #include <QDate>
-#include <QModelIndex>
-#include <QString>
-#include <qtmetamacros.h>
-
-class QObject;
-template <typename T> class QList;
 
 class TipOfTheDay
 {
diff --git a/cockatrice/src/interface/widgets/general/background_sources.h b/cockatrice/src/interface/widgets/general/background_sources.h
index 775d55895..423111bb6 100644
--- a/cockatrice/src/interface/widgets/general/background_sources.h
+++ b/cockatrice/src/interface/widgets/general/background_sources.h
@@ -9,10 +9,7 @@
 
 #include <QList>
 #include <QObject>
-#include <QSharedPointer>
 #include <QString>
-#include <QtGlobal>
-#include <qtmetamacros.h>
 
 class BackgroundSources
 {
diff --git a/cockatrice/src/interface/widgets/general/display/background_plate_widget.cpp b/cockatrice/src/interface/widgets/general/display/background_plate_widget.cpp
index fd9ad67a8..aad259900 100644
--- a/cockatrice/src/interface/widgets/general/display/background_plate_widget.cpp
+++ b/cockatrice/src/interface/widgets/general/display/background_plate_widget.cpp
@@ -1,9 +1,9 @@
 #include "background_plate_widget.h"
 
+#include <QBrush>
 #include <QColor>
 #include <QPainter>
-#include <QRect>
-#include <qnamespace.h>
+#include <QPen>
 
 BackgroundPlateWidget::BackgroundPlateWidget(QWidget *parent) : QWidget(parent)
 {
diff --git a/cockatrice/src/interface/widgets/general/display/background_plate_widget.h b/cockatrice/src/interface/widgets/general/display/background_plate_widget.h
index 6634069c4..1fc1bc3ba 100644
--- a/cockatrice/src/interface/widgets/general/display/background_plate_widget.h
+++ b/cockatrice/src/interface/widgets/general/display/background_plate_widget.h
@@ -2,7 +2,6 @@
 #define COCKATRICE_BACKGROUND_PLATE_WIDGET_H
 
 #include <QWidget>
-#include <qtmetamacros.h>
 
 class BackgroundPlateWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/general/display/banner_widget.cpp b/cockatrice/src/interface/widgets/general/display/banner_widget.cpp
index baf46bbba..31f384cac 100644
--- a/cockatrice/src/interface/widgets/general/display/banner_widget.cpp
+++ b/cockatrice/src/interface/widgets/general/display/banner_widget.cpp
@@ -2,15 +2,10 @@
 
 #include "../../../pixel_map_generator.h"
 
-#include <QBrush>
-#include <QColor>
-#include <QHBoxLayout>
 #include <QLinearGradient>
+#include <QMouseEvent>
 #include <QPainter>
-#include <QPixmap>
-#include <QPointF>
-#include <QRect>
-#include <QtGlobal>
+#include <QVBoxLayout>
 
 BannerWidget::BannerWidget(QWidget *parent, const QString &text, Qt::Orientation orientation, int transparency_)
     : QWidget(parent), gradientOrientation(orientation), transparency(qBound(0, transparency_, 100))
diff --git a/cockatrice/src/interface/widgets/general/display/banner_widget.h b/cockatrice/src/interface/widgets/general/display/banner_widget.h
index 06556089b..77a05abb6 100644
--- a/cockatrice/src/interface/widgets/general/display/banner_widget.h
+++ b/cockatrice/src/interface/widgets/general/display/banner_widget.h
@@ -10,10 +10,8 @@
 #define BANNER_WIDGET_H
 
 #include <QLabel>
-#include <QString>
+#include <QVBoxLayout>
 #include <QWidget>
-#include <qnamespace.h>
-#include <qtmetamacros.h>
 
 class BannerWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/general/display/charts/bars/bar_chart_background_widget.cpp b/cockatrice/src/interface/widgets/general/display/charts/bars/bar_chart_background_widget.cpp
index 3ea2df6bd..f7ca669f3 100644
--- a/cockatrice/src/interface/widgets/general/display/charts/bars/bar_chart_background_widget.cpp
+++ b/cockatrice/src/interface/widgets/general/display/charts/bars/bar_chart_background_widget.cpp
@@ -1,17 +1,5 @@
 #include "bar_chart_background_widget.h"
 
-#include <QBrush>
-#include <QColor>
-#include <QFlags>
-#include <QPainter>
-#include <QPen>
-#include <QRect>
-#include <QSize>
-#include <QSizePolicy>
-#include <QString>
-#include <QtGlobal>
-#include <qnamespace.h>
-
 BarChartBackgroundWidget::BarChartBackgroundWidget(QWidget *parent) : QWidget(parent)
 {
     setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
diff --git a/cockatrice/src/interface/widgets/general/display/charts/bars/bar_chart_background_widget.h b/cockatrice/src/interface/widgets/general/display/charts/bars/bar_chart_background_widget.h
index 1fc8a3bde..06a17c7c6 100644
--- a/cockatrice/src/interface/widgets/general/display/charts/bars/bar_chart_background_widget.h
+++ b/cockatrice/src/interface/widgets/general/display/charts/bars/bar_chart_background_widget.h
@@ -1,8 +1,8 @@
 #ifndef COCKATRICE_BAR_CHART_BACKGROUND_WIDGET_H
 #define COCKATRICE_BAR_CHART_BACKGROUND_WIDGET_H
 
+#include <QPainter>
 #include <QWidget>
-#include <qtmetamacros.h>
 
 class BarChartBackgroundWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/general/display/charts/bars/bar_chart_widget.cpp b/cockatrice/src/interface/widgets/general/display/charts/bars/bar_chart_widget.cpp
index 484ac861d..04315d0ce 100644
--- a/cockatrice/src/interface/widgets/general/display/charts/bars/bar_chart_widget.cpp
+++ b/cockatrice/src/interface/widgets/general/display/charts/bars/bar_chart_widget.cpp
@@ -1,20 +1,9 @@
 #include "bar_chart_widget.h"
 
-#include <QBrush>
-#include <QFlags>
-#include <QFont>
-#include <QLinearGradient>
 #include <QMouseEvent>
 #include <QPainter>
 #include <QPainterPath>
-#include <QPen>
-#include <QPoint>
-#include <QPointF>
-#include <QRect>
-#include <QSize>
 #include <QToolTip>
-#include <QtGlobal>
-#include <qnamespace.h>
 
 BarChartWidget::BarChartWidget(QWidget *parent) : QWidget(parent)
 {
diff --git a/cockatrice/src/interface/widgets/general/display/charts/bars/bar_chart_widget.h b/cockatrice/src/interface/widgets/general/display/charts/bars/bar_chart_widget.h
index a596c094a..e80a3f8e8 100644
--- a/cockatrice/src/interface/widgets/general/display/charts/bars/bar_chart_widget.h
+++ b/cockatrice/src/interface/widgets/general/display/charts/bars/bar_chart_widget.h
@@ -2,12 +2,9 @@
 #define COCKATRICE_BAR_CHART_WIDGET_H
 
 #include <QColor>
-#include <QList>
 #include <QString>
-#include <QStringList>
 #include <QVector>
 #include <QWidget>
-#include <qtmetamacros.h>
 
 struct BarSegment
 {
diff --git a/cockatrice/src/interface/widgets/general/display/charts/bars/bar_widget.cpp b/cockatrice/src/interface/widgets/general/display/charts/bars/bar_widget.cpp
index 82d15d5be..2194b6b03 100644
--- a/cockatrice/src/interface/widgets/general/display/charts/bars/bar_widget.cpp
+++ b/cockatrice/src/interface/widgets/general/display/charts/bars/bar_widget.cpp
@@ -2,10 +2,6 @@
 
 #include <QFontMetrics>
 #include <QPainter>
-#include <QRect>
-#include <QSize>
-#include <QSizePolicy>
-#include <utility>
 
 BarWidget::BarWidget(QString label, int value, int total, QColor barColor, QWidget *parent)
     : QWidget(parent), label(std::move(label)), value(value), total(total), barColor(barColor)
diff --git a/cockatrice/src/interface/widgets/general/display/charts/bars/bar_widget.h b/cockatrice/src/interface/widgets/general/display/charts/bars/bar_widget.h
index 18da1f939..05814f15b 100644
--- a/cockatrice/src/interface/widgets/general/display/charts/bars/bar_widget.h
+++ b/cockatrice/src/interface/widgets/general/display/charts/bars/bar_widget.h
@@ -8,11 +8,7 @@
 #ifndef BAR_WIDGET_H
 #define BAR_WIDGET_H
 
-#include <QColor>
-#include <QString>
 #include <QWidget>
-#include <qnamespace.h>
-#include <qtmetamacros.h>
 
 class BarWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/general/display/charts/bars/color_bar.cpp b/cockatrice/src/interface/widgets/general/display/charts/bars/color_bar.cpp
index 28118cc9c..1087c621e 100644
--- a/cockatrice/src/interface/widgets/general/display/charts/bars/color_bar.cpp
+++ b/cockatrice/src/interface/widgets/general/display/charts/bars/color_bar.cpp
@@ -2,21 +2,10 @@
 
 #include "libcockatrice/utility/color.h"
 
-#include <QBrush>
 #include <QLinearGradient>
-#include <QMap>
 #include <QMouseEvent>
 #include <QPainter>
-#include <QPen>
-#include <QPoint>
-#include <QPointF>
-#include <QRect>
-#include <QRectF>
-#include <QSize>
 #include <QToolTip>
-#include <QtGlobal>
-#include <qnamespace.h>
-#include <utility>
 
 ColorBar::ColorBar(const QMap<QString, int> &_colors, QWidget *parent)
     : QWidget(parent), colors(GameSpecificColors::MTG::sortManaMapWUBRGCFirst(_colors))
diff --git a/cockatrice/src/interface/widgets/general/display/charts/bars/color_bar.h b/cockatrice/src/interface/widgets/general/display/charts/bars/color_bar.h
index 3acb7f97f..1d435cec1 100644
--- a/cockatrice/src/interface/widgets/general/display/charts/bars/color_bar.h
+++ b/cockatrice/src/interface/widgets/general/display/charts/bars/color_bar.h
@@ -2,13 +2,9 @@
 #define COCKATRICE_COLOR_BAR_H
 
 #include <QColor>
-#include <QList>
-#include <QPair>
+#include <QMap>
 #include <QString>
 #include <QWidget>
-#include <qtmetamacros.h>
-
-template <class Key, class T> class QMap;
 
 /**
  * @class ColorBar
diff --git a/cockatrice/src/interface/widgets/general/display/charts/bars/percent_bar_widget.cpp b/cockatrice/src/interface/widgets/general/display/charts/bars/percent_bar_widget.cpp
index 33195a518..3726dd061 100644
--- a/cockatrice/src/interface/widgets/general/display/charts/bars/percent_bar_widget.cpp
+++ b/cockatrice/src/interface/widgets/general/display/charts/bars/percent_bar_widget.cpp
@@ -1,13 +1,5 @@
 #include "percent_bar_widget.h"
 
-#include <QBrush>
-#include <QPainter>
-#include <QPen>
-#include <QRect>
-#include <QtGlobal>
-#include <qnamespace.h>
-#include <qnumeric.h>
-
 PercentBarWidget::PercentBarWidget(QWidget *parent, double initialValue) : QWidget(parent), valueToDisplay(initialValue)
 {
     setMinimumSize(50, 10);
diff --git a/cockatrice/src/interface/widgets/general/display/charts/bars/percent_bar_widget.h b/cockatrice/src/interface/widgets/general/display/charts/bars/percent_bar_widget.h
index f12cb8ae7..9cd6039c8 100644
--- a/cockatrice/src/interface/widgets/general/display/charts/bars/percent_bar_widget.h
+++ b/cockatrice/src/interface/widgets/general/display/charts/bars/percent_bar_widget.h
@@ -8,9 +8,8 @@
 #ifndef PERCENT_BAR_WIDGET_H
 #define PERCENT_BAR_WIDGET_H
 
+#include <QPainter>
 #include <QWidget>
-#include <QtGlobal>
-#include <qtmetamacros.h>
 
 class PercentBarWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/general/display/charts/bars/segmented_bar_widget.cpp b/cockatrice/src/interface/widgets/general/display/charts/bars/segmented_bar_widget.cpp
index 5a3130964..03c69373a 100644
--- a/cockatrice/src/interface/widgets/general/display/charts/bars/segmented_bar_widget.cpp
+++ b/cockatrice/src/interface/widgets/general/display/charts/bars/segmented_bar_widget.cpp
@@ -1,19 +1,9 @@
 #include "segmented_bar_widget.h"
 
-#include <QBrush>
-#include <QFont>
-#include <QLinearGradient>
 #include <QMouseEvent>
 #include <QPainter>
 #include <QPainterPath>
-#include <QPoint>
-#include <QPointF>
-#include <QRect>
-#include <QSize>
-#include <QSizePolicy>
 #include <QToolTip>
-#include <qnamespace.h>
-#include <utility>
 
 SegmentedBarWidget::SegmentedBarWidget(QString label, QVector<Segment> segments, int total, QWidget *parent)
     : QWidget(parent), label(std::move(label)), segments(std::move(segments)), total(total)
diff --git a/cockatrice/src/interface/widgets/general/display/charts/bars/segmented_bar_widget.h b/cockatrice/src/interface/widgets/general/display/charts/bars/segmented_bar_widget.h
index c8c7dc2b9..4df54e42e 100644
--- a/cockatrice/src/interface/widgets/general/display/charts/bars/segmented_bar_widget.h
+++ b/cockatrice/src/interface/widgets/general/display/charts/bars/segmented_bar_widget.h
@@ -2,12 +2,8 @@
 #define COCKATRICE_SEGMENTED_BAR_WIDGET_H
 
 #include <QColor>
-#include <QList>
-#include <QString>
-#include <QStringList>
 #include <QVector>
 #include <QWidget>
-#include <qtmetamacros.h>
 
 class SegmentedBarWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/general/display/charts/pies/color_pie.cpp b/cockatrice/src/interface/widgets/general/display/charts/pies/color_pie.cpp
index 82542a663..bd4641981 100644
--- a/cockatrice/src/interface/widgets/general/display/charts/pies/color_pie.cpp
+++ b/cockatrice/src/interface/widgets/general/display/charts/pies/color_pie.cpp
@@ -2,22 +2,10 @@
 
 #include "libcockatrice/utility/color.h"
 
-#include <QBrush>
-#include <QFontMetrics>
 #include <QMouseEvent>
 #include <QPainter>
-#include <QPen>
-#include <QPoint>
-#include <QPointF>
-#include <QRadialGradient>
-#include <QRectF>
-#include <QSize>
 #include <QToolTip>
-#include <QtGlobal>
 #include <QtMath>
-#include <cmath>
-#include <qnamespace.h>
-#include <utility>
 
 ColorPie::ColorPie(const QMap<QString, int> &_colors, QWidget *parent)
     : QWidget(parent), colors(GameSpecificColors::MTG::sortManaMapWUBRGCFirst(_colors))
diff --git a/cockatrice/src/interface/widgets/general/display/charts/pies/color_pie.h b/cockatrice/src/interface/widgets/general/display/charts/pies/color_pie.h
index 0fe023f63..60d8e18f2 100644
--- a/cockatrice/src/interface/widgets/general/display/charts/pies/color_pie.h
+++ b/cockatrice/src/interface/widgets/general/display/charts/pies/color_pie.h
@@ -1,12 +1,6 @@
 #ifndef COCKATRICE_COLOR_PIE_H
 #define COCKATRICE_COLOR_PIE_H
 
-#include <QColor>
-#include <QList>
-#include <QPair>
-#include <qtmetamacros.h>
-
-class QPoint;
 #ifndef COLOR_PIE_H
 #define COLOR_PIE_H
 
diff --git a/cockatrice/src/interface/widgets/general/display/dynamic_font_size_label.cpp b/cockatrice/src/interface/widgets/general/display/dynamic_font_size_label.cpp
index 0609eb16a..f485e0040 100644
--- a/cockatrice/src/interface/widgets/general/display/dynamic_font_size_label.cpp
+++ b/cockatrice/src/interface/widgets/general/display/dynamic_font_size_label.cpp
@@ -1,17 +1,8 @@
 #include "dynamic_font_size_label.h"
-
-#include <QFont>
-#include <QFontMetricsF>
-#include <QObject>
-#include <QRect>
-#include <QRectF>
-#include <QSharedPointer>
-#include <QSize>
-#include <QWidget>
-#include <QtGlobal>
-
 #define FONT_PRECISION (0.5)
 
+#include <QElapsedTimer>
+
 DynamicFontSizeLabel::DynamicFontSizeLabel(QWidget *parent, Qt::WindowFlags f) : QLabel(parent, f)
 {
     setIndent(0);
diff --git a/cockatrice/src/interface/widgets/general/display/dynamic_font_size_label.h b/cockatrice/src/interface/widgets/general/display/dynamic_font_size_label.h
index cd029902a..c9b159b02 100644
--- a/cockatrice/src/interface/widgets/general/display/dynamic_font_size_label.h
+++ b/cockatrice/src/interface/widgets/general/display/dynamic_font_size_label.h
@@ -9,12 +9,6 @@
 
 #include <QColor>
 #include <QLabel>
-#include <QString>
-#include <qnamespace.h>
-#include <qtmetamacros.h>
-#include <stddef.h>
-
-class QWidget;
 
 class DynamicFontSizeLabel : public QLabel
 {
diff --git a/cockatrice/src/interface/widgets/general/display/dynamic_font_size_push_button.cpp b/cockatrice/src/interface/widgets/general/display/dynamic_font_size_push_button.cpp
index 25e8ca48f..653b2cd5c 100644
--- a/cockatrice/src/interface/widgets/general/display/dynamic_font_size_push_button.cpp
+++ b/cockatrice/src/interface/widgets/general/display/dynamic_font_size_push_button.cpp
@@ -2,14 +2,7 @@
 
 #include "dynamic_font_size_label.h"
 
-#include <QBrush>
-#include <QFont>
-#include <QLinearGradient>
 #include <QPainter>
-#include <QPen>
-#include <QSize>
-#include <QWidget>
-#include <qnamespace.h>
 
 DynamicFontSizePushButton::DynamicFontSizePushButton(QWidget *parent) : QPushButton(parent)
 {
diff --git a/cockatrice/src/interface/widgets/general/display/dynamic_font_size_push_button.h b/cockatrice/src/interface/widgets/general/display/dynamic_font_size_push_button.h
index dfbb03d20..540abfe6b 100644
--- a/cockatrice/src/interface/widgets/general/display/dynamic_font_size_push_button.h
+++ b/cockatrice/src/interface/widgets/general/display/dynamic_font_size_push_button.h
@@ -7,12 +7,9 @@
 #ifndef DYNAMICFONTSIZEPUSHBUTTON_H
 #define DYNAMICFONTSIZEPUSHBUTTON_H
 
-#include <QColor>
+#include <QObject>
 #include <QPushButton>
-#include <QString>
-#include <stddef.h>
-
-class QWidget;
+#include <QWidget>
 
 class DynamicFontSizePushButton : public QPushButton
 {
diff --git a/cockatrice/src/interface/widgets/general/display/labeled_input.cpp b/cockatrice/src/interface/widgets/general/display/labeled_input.cpp
index 40ee91bcc..ee26c78d9 100644
--- a/cockatrice/src/interface/widgets/general/display/labeled_input.cpp
+++ b/cockatrice/src/interface/widgets/general/display/labeled_input.cpp
@@ -1,12 +1,5 @@
 #include "labeled_input.h"
 
-#include <QComboBox>
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QList>
-#include <QSpinBox>
-#include <qobjectdefs.h>
-
 LabeledInput::LabeledInput(QWidget *parent, const QString &labelText) : QWidget(parent)
 {
     label = new QLabel(labelText, this);
diff --git a/cockatrice/src/interface/widgets/general/display/labeled_input.h b/cockatrice/src/interface/widgets/general/display/labeled_input.h
index a07d50dbb..838dfb280 100644
--- a/cockatrice/src/interface/widgets/general/display/labeled_input.h
+++ b/cockatrice/src/interface/widgets/general/display/labeled_input.h
@@ -7,15 +7,11 @@
 #ifndef LABELED_INPUT_H
 #define LABELED_INPUT_H
 
-#include <QString>
-#include <QStringList>
+#include <QComboBox>
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QSpinBox>
 #include <QWidget>
-#include <qtmetamacros.h>
-
-class QComboBox;
-class QHBoxLayout;
-class QLabel;
-class QSpinBox;
 
 class LabeledInput final : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/general/display/shadow_background_label.cpp b/cockatrice/src/interface/widgets/general/display/shadow_background_label.cpp
index e1218a6fb..7db18c57d 100644
--- a/cockatrice/src/interface/widgets/general/display/shadow_background_label.cpp
+++ b/cockatrice/src/interface/widgets/general/display/shadow_background_label.cpp
@@ -1,13 +1,7 @@
 #include "shadow_background_label.h"
 
-#include <QColor>
-#include <QMargins>
+#include <QPaintEvent>
 #include <QPainter>
-#include <QRect>
-#include <QSizePolicy>
-#include <qnamespace.h>
-
-class QWidget;
 
 /**
  * @class ShadowBackgroundLabel
diff --git a/cockatrice/src/interface/widgets/general/display/shadow_background_label.h b/cockatrice/src/interface/widgets/general/display/shadow_background_label.h
index e64b9ca5b..69232691e 100644
--- a/cockatrice/src/interface/widgets/general/display/shadow_background_label.h
+++ b/cockatrice/src/interface/widgets/general/display/shadow_background_label.h
@@ -8,10 +8,6 @@
 #define STYLEDLABEL_H
 
 #include <QLabel>
-#include <QString>
-#include <qtmetamacros.h>
-
-class QWidget;
 
 class ShadowBackgroundLabel : public QLabel
 {
diff --git a/cockatrice/src/interface/widgets/general/home_styled_button.cpp b/cockatrice/src/interface/widgets/general/home_styled_button.cpp
index 7f23827bc..c7bdd1e5e 100644
--- a/cockatrice/src/interface/widgets/general/home_styled_button.cpp
+++ b/cockatrice/src/interface/widgets/general/home_styled_button.cpp
@@ -1,19 +1,9 @@
 #include "home_styled_button.h"
 
-#include <QBrush>
-#include <QFontMetrics>
 #include <QPainter>
 #include <QPainterPath>
-#include <QPen>
-#include <QPointF>
-#include <QSize>
-#include <QSizePolicy>
-#include <QStyle>
-#include <QStyleOptionButton>
-#include <QtGlobal>
-#include <qnamespace.h>
-
-class QWidget;
+#include <qgraphicseffect.h>
+#include <qstyleoption.h>
 
 HomeStyledButton::HomeStyledButton(const QString &text, QPair<QColor, QColor> _gradientColors, QWidget *parent)
     : QPushButton(text, parent), gradientColors(_gradientColors)
diff --git a/cockatrice/src/interface/widgets/general/home_styled_button.h b/cockatrice/src/interface/widgets/general/home_styled_button.h
index 55ac5550f..f8d97e9aa 100644
--- a/cockatrice/src/interface/widgets/general/home_styled_button.h
+++ b/cockatrice/src/interface/widgets/general/home_styled_button.h
@@ -6,13 +6,7 @@
 
 #ifndef HOME_STYLED_BUTTON_H
 #define HOME_STYLED_BUTTON_H
-#include <QColor>
-#include <QPair>
 #include <QPushButton>
-#include <QString>
-#include <qtmetamacros.h>
-
-class QWidget;
 
 class HomeStyledButton : public QPushButton
 {
diff --git a/cockatrice/src/interface/widgets/general/home_widget.cpp b/cockatrice/src/interface/widgets/general/home_widget.cpp
index c77fd76fd..648d315f9 100644
--- a/cockatrice/src/interface/widgets/general/home_widget.cpp
+++ b/cockatrice/src/interface/widgets/general/home_widget.cpp
@@ -2,68 +2,25 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../../interface/widgets/tabs/tab_supervisor.h"
-#include "../../deck_loader/deck_file_format.h"
-#include "../../deck_loader/deck_loader.h"
-#include "../../deck_loader/loaded_deck.h"
 #include "../../pixel_map_generator.h"
-#include "../../theme_config.h"
 #include "../../theme_manager.h"
 #include "../../window_main.h"
 #include "../cards/art_crop_attribution.h"
-#include "../cards/card_info_picture_art_crop_widget.h"
-#include "abstract_client.h"
 #include "background_sources.h"
 #include "home_styled_button.h"
 #include "home_tab_button_color.h"
-#include "libcockatrice/card/card_info.h"
-#include "libcockatrice/card/database/card_database.h"
-#include "libcockatrice/card/database/card_database_loader.h"
-#include "libcockatrice/card/database/card_database_querier.h"
-#include "libcockatrice/card/printing/exact_card.h"
-#include "libcockatrice/card/printing/printing_info.h"
-#include "libcockatrice/card/set/card_set.h"
-#include "libcockatrice/utility/card_ref.h"
 
-#include <QBrush>
-#include <QDebug>
-#include <QFlags>
-#include <QFont>
-#include <QFontMetrics>
-#include <QGridLayout>
 #include <QGroupBox>
-#include <QImage>
 #include <QLabel>
 #include <QLinearGradient>
-#include <QList>
-#include <QMap>
-#include <QObject>
 #include <QPainter>
 #include <QPainterPath>
-#include <QPoint>
-#include <QPointF>
 #include <QPushButton>
-#include <QRandomGenerator>
-#include <QRect>
-#include <QRectF>
-#include <QRgb>
-#include <QSharedPointer>
-#include <QSize>
-#include <QSizePolicy>
-#include <QString>
-#include <QStringLiteral>
-#include <QTimer>
 #include <QVBoxLayout>
-#include <QVector>
-#include <QtGlobal>
-#include <algorithm>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/network/client/remote/remote_client.h>
 #include <libcockatrice/settings/appearance_settings.h>
 #include <libcockatrice/settings/paths_settings.h>
-#include <optional>
-#include <qlogging.h>
-#include <qnamespace.h>
-#include <utility>
 
 HomeWidget::HomeWidget(QWidget *parent, TabSupervisor *_tabSupervisor)
     : QWidget(parent), tabSupervisor(_tabSupervisor), background(themePixmap(QStringLiteral("backgrounds/home")))
diff --git a/cockatrice/src/interface/widgets/general/home_widget.h b/cockatrice/src/interface/widgets/general/home_widget.h
index fb9566cad..1cadc4a67 100644
--- a/cockatrice/src/interface/widgets/general/home_widget.h
+++ b/cockatrice/src/interface/widgets/general/home_widget.h
@@ -7,23 +7,16 @@
 
 #ifndef HOME_WIDGET_H
 #define HOME_WIDGET_H
-#include "libcockatrice/deck_list/deck_list.h"
+#include "../../../interface/widgets/tabs/tab_supervisor.h"
+#include "../cards/card_info_picture_art_crop_widget.h"
+#include "home_styled_button.h"
 
-#include <QColor>
-#include <QPair>
-#include <QPixmap>
+#include <QGridLayout>
 #include <QWidget>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
-#include <qtmetamacros.h>
 
 class QGridLayout;
 class QLabel;
-class CardInfoPictureArtCropWidget;
-class ExactCard;
-class HomeStyledButton;
-class QGroupBox;
-class QTimer;
-class TabSupervisor;
 
 class HomeWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/general/layout_containers/flow_widget.cpp b/cockatrice/src/interface/widgets/general/layout_containers/flow_widget.cpp
index 6a6025ec2..01c9ac34e 100644
--- a/cockatrice/src/interface/widgets/general/layout_containers/flow_widget.cpp
+++ b/cockatrice/src/interface/widgets/general/layout_containers/flow_widget.cpp
@@ -6,17 +6,10 @@
 
 #include "flow_widget.h"
 
-#include "../../../layouts/flow_layout.h"
-
-#include <QEvent>
 #include <QHBoxLayout>
 #include <QKeyEvent>
-#include <QLayoutItem>
-#include <QList>
-#include <QMessageLogger>
 #include <QResizeEvent>
 #include <QScrollArea>
-#include <QSize>
 #include <QSizePolicy>
 #include <QWidget>
 
diff --git a/cockatrice/src/interface/widgets/general/layout_containers/flow_widget.h b/cockatrice/src/interface/widgets/general/layout_containers/flow_widget.h
index dbf33d07f..4d52db3f1 100644
--- a/cockatrice/src/interface/widgets/general/layout_containers/flow_widget.h
+++ b/cockatrice/src/interface/widgets/general/layout_containers/flow_widget.h
@@ -8,17 +8,13 @@
 #ifndef FLOW_WIDGET_H
 #define FLOW_WIDGET_H
 
-#include <QLoggingCategory>
-#include <QWidget>
-#include <qlogging.h>
-#include <qnamespace.h>
-#include <qtmetamacros.h>
+#include "../../../layouts/flow_layout.h"
 
-class FlowLayout;
-class QHBoxLayout;
-class QKeyEvent;
-class QLayoutItem;
-class QScrollArea;
+#include <QHBoxLayout>
+#include <QKeyEvent>
+#include <QLoggingCategory>
+#include <QScrollArea>
+#include <QWidget>
 
 inline Q_LOGGING_CATEGORY(FlowWidgetLog, "flow_widget", QtInfoMsg);
 inline Q_LOGGING_CATEGORY(FlowWidgetSizeLog, "flow_widget.size", QtInfoMsg);
diff --git a/cockatrice/src/interface/widgets/general/layout_containers/overlap_control_widget.cpp b/cockatrice/src/interface/widgets/general/layout_containers/overlap_control_widget.cpp
index 8cfe190e2..97068978d 100644
--- a/cockatrice/src/interface/widgets/general/layout_containers/overlap_control_widget.cpp
+++ b/cockatrice/src/interface/widgets/general/layout_containers/overlap_control_widget.cpp
@@ -1,11 +1,7 @@
 #include "overlap_control_widget.h"
 
-#include "../display/labeled_input.h"
 #include "overlap_widget.h"
 
-#include <QHBoxLayout>
-#include <QSlider>
-
 OverlapControlWidget::OverlapControlWidget(int overlapPercentage,
                                            int maxColumns,
                                            int maxRows,
diff --git a/cockatrice/src/interface/widgets/general/layout_containers/overlap_control_widget.h b/cockatrice/src/interface/widgets/general/layout_containers/overlap_control_widget.h
index c5639110f..104a97da9 100644
--- a/cockatrice/src/interface/widgets/general/layout_containers/overlap_control_widget.h
+++ b/cockatrice/src/interface/widgets/general/layout_containers/overlap_control_widget.h
@@ -6,14 +6,12 @@
 
 #ifndef OVERLAP_CONTROL_WIDGET_H
 #define OVERLAP_CONTROL_WIDGET_H
-#include <QWidget>
-#include <qnamespace.h>
-#include <qtmetamacros.h>
+#include "../display/labeled_input.h"
+#include "overlap_widget.h"
 
-class LabeledInput;
-class OverlapWidget;
-class QHBoxLayout;
-class QSlider;
+#include <QHBoxLayout>
+#include <QSlider>
+#include <QWidget>
 
 class OverlapControlWidget final : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/general/layout_containers/overlap_widget.cpp b/cockatrice/src/interface/widgets/general/layout_containers/overlap_widget.cpp
index 03240211c..1c4ee30ab 100644
--- a/cockatrice/src/interface/widgets/general/layout_containers/overlap_widget.cpp
+++ b/cockatrice/src/interface/widgets/general/layout_containers/overlap_widget.cpp
@@ -1,9 +1,9 @@
 #include "overlap_widget.h"
 
-#include "../../../layouts/overlap_layout.h"
+#include "../../../layouts/flow_layout.h"
 
-#include <QLayoutItem>
 #include <QWidget>
+#include <libcockatrice/models/deck_list/deck_list_model.h>
 
 /**
  * @class OverlapWidget
diff --git a/cockatrice/src/interface/widgets/general/layout_containers/overlap_widget.h b/cockatrice/src/interface/widgets/general/layout_containers/overlap_widget.h
index c103c5f80..62c620201 100644
--- a/cockatrice/src/interface/widgets/general/layout_containers/overlap_widget.h
+++ b/cockatrice/src/interface/widgets/general/layout_containers/overlap_widget.h
@@ -7,12 +7,9 @@
 #ifndef OVERLAP_WIDGET_H
 #define OVERLAP_WIDGET_H
 
-#include <QString>
-#include <QWidget>
-#include <qnamespace.h>
-#include <qtmetamacros.h>
+#include "../../../layouts/overlap_layout.h"
 
-class OverlapLayout;
+#include <QWidget>
 
 class OverlapWidget final : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/menus/deck_editor_menu.cpp b/cockatrice/src/interface/widgets/menus/deck_editor_menu.cpp
index b0503ec22..6e27b4e42 100644
--- a/cockatrice/src/interface/widgets/menus/deck_editor_menu.cpp
+++ b/cockatrice/src/interface/widgets/menus/deck_editor_menu.cpp
@@ -2,14 +2,9 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../../client/settings/shortcuts_settings.h"
-#include "../deck_editor/deck_editor_filter_dock_widget.h"
 #include "../tabs/abstract_tab_deck_editor.h"
 
-#include <QAction>
-#include <QList>
-#include <QString>
 #include <libcockatrice/settings/recents_settings.h>
-
 DeckEditorMenu::DeckEditorMenu(AbstractTabDeckEditor *parent) : QMenu(parent), deckEditor(parent)
 {
     aNewDeck = new QAction(QString(), this);
diff --git a/cockatrice/src/interface/widgets/menus/deck_editor_menu.h b/cockatrice/src/interface/widgets/menus/deck_editor_menu.h
index 904fbb6f4..08ce7bba1 100644
--- a/cockatrice/src/interface/widgets/menus/deck_editor_menu.h
+++ b/cockatrice/src/interface/widgets/menus/deck_editor_menu.h
@@ -8,11 +8,8 @@
 #define DECK_EDITOR_MENU_H
 
 #include <QMenu>
-#include <qtmetamacros.h>
 
 class AbstractTabDeckEditor;
-class QAction;
-
 class DeckEditorMenu : public QMenu
 {
     Q_OBJECT
diff --git a/cockatrice/src/interface/widgets/onboarding/first_run_wizard.cpp b/cockatrice/src/interface/widgets/onboarding/first_run_wizard.cpp
index 426811ec2..4af02fe4f 100644
--- a/cockatrice/src/interface/widgets/onboarding/first_run_wizard.cpp
+++ b/cockatrice/src/interface/widgets/onboarding/first_run_wizard.cpp
@@ -10,6 +10,7 @@
 #include "shader_banner_widget.h"
 #include "step_indicator_widget.h"
 
+#include <QCloseEvent>
 #include <QEvent>
 #include <QFont>
 #include <QHBoxLayout>
@@ -17,10 +18,6 @@
 #include <QPushButton>
 #include <QStackedWidget>
 #include <QVBoxLayout>
-#include <qnamespace.h>
-#include <utility>
-
-class QWidget;
 
 FirstRunWizard::FirstRunWizard(QWidget *parent) : QDialog(parent)
 {
@@ -185,10 +182,10 @@ void FirstRunWizard::onCardDatabaseUpdateFinished(bool success)
     }
 }
 
-void FirstRunWizard::onCardDatabaseUpdateProgress(const CardUpdateProgress &progress)
+void FirstRunWizard::onCardDatabaseUpdateProgress(const QString &stage, qint64 done, qint64 total)
 {
     if (cardDatabasePage) {
-        cardDatabasePage->onUpdateProgress(progress);
+        cardDatabasePage->onUpdateProgress(stage, done, total);
     }
 }
 
diff --git a/cockatrice/src/interface/widgets/onboarding/first_run_wizard.h b/cockatrice/src/interface/widgets/onboarding/first_run_wizard.h
index 812985a9f..21d7b6e06 100644
--- a/cockatrice/src/interface/widgets/onboarding/first_run_wizard.h
+++ b/cockatrice/src/interface/widgets/onboarding/first_run_wizard.h
@@ -1,13 +1,8 @@
 #ifndef FIRST_RUN_WIZARD_H
 #define FIRST_RUN_WIZARD_H
 
-#include "../../card_database_update/card_update_progress.h"
-
 #include <QDialog>
 #include <QList>
-#include <QString>
-#include <QtGlobal>
-#include <qtmetamacros.h>
 
 class BannerHost;
 class FirstRunWizardPage;
@@ -16,7 +11,6 @@ class CardDatabaseSetupPage;
 class QLabel;
 class QPushButton;
 class QStackedWidget;
-class QWidget;
 
 /** @brief Polished first-run onboarding flow: card database setup, theme
  *         selection, server account setup, and a handful of key preferences.
@@ -44,7 +38,7 @@ public slots:
     void onCardDatabaseUpdateFinished(bool success);
 
     /** @brief Forwarded from MainWindow while the background card database update process runs. */
-    void onCardDatabaseUpdateProgress(const CardUpdateProgress &progress);
+    void onCardDatabaseUpdateProgress(const QString &stage, qint64 done, qint64 total);
 
 protected:
     void closeEvent(QCloseEvent *event) override;
diff --git a/cockatrice/src/interface/widgets/onboarding/first_run_wizard_page.h b/cockatrice/src/interface/widgets/onboarding/first_run_wizard_page.h
index e7b818810..bdcd123bd 100644
--- a/cockatrice/src/interface/widgets/onboarding/first_run_wizard_page.h
+++ b/cockatrice/src/interface/widgets/onboarding/first_run_wizard_page.h
@@ -1,9 +1,7 @@
 #ifndef FIRST_RUN_WIZARD_PAGE_H
 #define FIRST_RUN_WIZARD_PAGE_H
 
-#include <QString>
 #include <QWidget>
-#include <qtmetamacros.h>
 
 /** @brief Base class for a single step of FirstRunWizard.
  *
diff --git a/cockatrice/src/interface/widgets/onboarding/pages/account_setup_page.cpp b/cockatrice/src/interface/widgets/onboarding/pages/account_setup_page.cpp
index 16a1d2254..2107ea8bf 100644
--- a/cockatrice/src/interface/widgets/onboarding/pages/account_setup_page.cpp
+++ b/cockatrice/src/interface/widgets/onboarding/pages/account_setup_page.cpp
@@ -1,14 +1,8 @@
 #include "account_setup_page.h"
 
-#include "../first_run_wizard_page.h"
-
 #include <QLabel>
 #include <QPushButton>
-#include <QString>
 #include <QVBoxLayout>
-#include <qnamespace.h>
-
-class QWidget;
 
 AccountSetupPage::AccountSetupPage(QWidget *parent) : FirstRunWizardPage(parent)
 {
diff --git a/cockatrice/src/interface/widgets/onboarding/pages/account_setup_page.h b/cockatrice/src/interface/widgets/onboarding/pages/account_setup_page.h
index 344b4e41a..0d9b76699 100644
--- a/cockatrice/src/interface/widgets/onboarding/pages/account_setup_page.h
+++ b/cockatrice/src/interface/widgets/onboarding/pages/account_setup_page.h
@@ -3,11 +3,8 @@
 
 #include "../first_run_wizard_page.h"
 
-#include <qtmetamacros.h>
-
 class QLabel;
 class QPushButton;
-class QWidget;
 
 /** @brief First-run account step. Does NOT embed DlgRegister's fields: they exist
  *         to be handed to ConnectionController's network registration flow, which
diff --git a/cockatrice/src/interface/widgets/onboarding/pages/card_database_setup_page.cpp b/cockatrice/src/interface/widgets/onboarding/pages/card_database_setup_page.cpp
index cb53a25f3..50e8ff63d 100644
--- a/cockatrice/src/interface/widgets/onboarding/pages/card_database_setup_page.cpp
+++ b/cockatrice/src/interface/widgets/onboarding/pages/card_database_setup_page.cpp
@@ -1,31 +1,23 @@
 #include "card_database_setup_page.h"
 
 #include "../../client/settings/cache_settings.h"
-#include "../first_run_wizard_page.h"
-#include "libcockatrice/card/database/card_database.h"
 
 #include <QComboBox>
 #include <QGridLayout>
 #include <QHBoxLayout>
 #include <QLabel>
-#include <QLatin1String>
 #include <QLineEdit>
 #include <QMessageBox>
 #include <QProgressBar>
 #include <QPushButton>
 #include <QSettings>
-#include <QSharedPointer>
 #include <QSpinBox>
 #include <QTimer>
 #include <QUrl>
 #include <QVBoxLayout>
-#include <QVariant>
-#include <QWidget>
-#include <QtGlobal>
 #include <climits>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/settings/updates_settings.h>
-#include <qnamespace.h>
 
 CardDatabaseSetupPage::CardDatabaseSetupPage(QWidget *parent) : FirstRunWizardPage(parent)
 {
@@ -188,29 +180,21 @@ void CardDatabaseSetupPage::onUpdateFinished(bool success)
     }
 }
 
-void CardDatabaseSetupPage::onUpdateProgress(const CardUpdateProgress &progress)
+void CardDatabaseSetupPage::onUpdateProgress(const QString &stage, qint64 done, qint64 total)
 {
     if (state != State::Running) {
         return;
     }
-    const qint64 total = progress.total;
-    const qint64 done = progress.done;
     progressBar->setRange(0, total > 0 ? static_cast<int>(qMin<qint64>(total, INT_MAX)) : 0);
     progressBar->setValue(static_cast<int>(qMin<qint64>(done, INT_MAX)));
     if (total > 0) {
         const int percent = static_cast<int>((100.0 * done) / total);
-        switch (progress.stage) {
-            case CardUpdateStage::Download:
-                statusLabel->setText(tr("Downloading the card database (%1%)…").arg(percent));
-                break;
-            case CardUpdateStage::Scan:
-                statusLabel->setText(tr("Parsing the card database (%1%)…").arg(percent));
-                break;
-            case CardUpdateStage::Import:
-                statusLabel->setText(tr("Importing cards (%1%)…").arg(percent));
-                break;
-            case CardUpdateStage::Unknown:
-                break;
+        if (stage == QLatin1String("download")) {
+            statusLabel->setText(tr("Downloading the card database (%1%)…").arg(percent));
+        } else if (stage == QLatin1String("scan")) {
+            statusLabel->setText(tr("Parsing the card database (%1%)…").arg(percent));
+        } else if (stage == QLatin1String("import")) {
+            statusLabel->setText(tr("Importing cards (%1%)…").arg(percent));
         }
     }
 }
diff --git a/cockatrice/src/interface/widgets/onboarding/pages/card_database_setup_page.h b/cockatrice/src/interface/widgets/onboarding/pages/card_database_setup_page.h
index a84223497..870e759ea 100644
--- a/cockatrice/src/interface/widgets/onboarding/pages/card_database_setup_page.h
+++ b/cockatrice/src/interface/widgets/onboarding/pages/card_database_setup_page.h
@@ -1,13 +1,9 @@
 #ifndef CARD_DATABASE_SETUP_PAGE_H
 #define CARD_DATABASE_SETUP_PAGE_H
 
-#include "../../../card_database_update/card_update_progress.h"
 #include "../first_run_wizard_page.h"
 
 #include <QSize>
-#include <QString>
-#include <QtGlobal>
-#include <qtmetamacros.h>
 
 class QComboBox;
 class QLabel;
@@ -34,7 +30,7 @@ public:
     void retranslateUi() override;
 
     void onUpdateFinished(bool success);
-    void onUpdateProgress(const CardUpdateProgress &progress);
+    void onUpdateProgress(const QString &stage, qint64 done, qint64 total);
 
 signals:
     void updateRequested();
diff --git a/cockatrice/src/interface/widgets/onboarding/pages/finish_page.cpp b/cockatrice/src/interface/widgets/onboarding/pages/finish_page.cpp
index 1adf35282..4205fa532 100644
--- a/cockatrice/src/interface/widgets/onboarding/pages/finish_page.cpp
+++ b/cockatrice/src/interface/widgets/onboarding/pages/finish_page.cpp
@@ -1,13 +1,7 @@
 #include "finish_page.h"
 
-#include "../first_run_wizard_page.h"
-
 #include <QLabel>
-#include <QString>
 #include <QVBoxLayout>
-#include <qnamespace.h>
-
-class QWidget;
 
 FinishPage::FinishPage(QWidget *parent) : FirstRunWizardPage(parent)
 {
diff --git a/cockatrice/src/interface/widgets/onboarding/pages/finish_page.h b/cockatrice/src/interface/widgets/onboarding/pages/finish_page.h
index b78e40ec5..40ebc6ed0 100644
--- a/cockatrice/src/interface/widgets/onboarding/pages/finish_page.h
+++ b/cockatrice/src/interface/widgets/onboarding/pages/finish_page.h
@@ -3,10 +3,7 @@
 
 #include "../first_run_wizard_page.h"
 
-#include <qtmetamacros.h>
-
 class QLabel;
-class QWidget;
 
 class FinishPage : public FirstRunWizardPage
 {
diff --git a/cockatrice/src/interface/widgets/onboarding/pages/preferences_setup_page.cpp b/cockatrice/src/interface/widgets/onboarding/pages/preferences_setup_page.cpp
index da08e3a12..fceb34deb 100644
--- a/cockatrice/src/interface/widgets/onboarding/pages/preferences_setup_page.cpp
+++ b/cockatrice/src/interface/widgets/onboarding/pages/preferences_setup_page.cpp
@@ -2,7 +2,6 @@
 
 #include "../../client/settings/cache_settings.h"
 #include "../../client/sound_engine.h"
-#include "../first_run_wizard_page.h"
 #include "libcockatrice/settings/interface_settings.h"
 #include "libcockatrice/settings/sound_settings.h"
 #include "libcockatrice/settings/tabs_settings.h"
@@ -10,16 +9,10 @@
 #include <QCheckBox>
 #include <QComboBox>
 #include <QFormLayout>
-#include <QFrame>
 #include <QGroupBox>
 #include <QLabel>
-#include <QList>
 #include <QScrollArea>
-#include <QString>
 #include <QVBoxLayout>
-#include <QVariant>
-#include <QWidget>
-#include <QtGlobal>
 
 namespace
 {
diff --git a/cockatrice/src/interface/widgets/onboarding/pages/preferences_setup_page.h b/cockatrice/src/interface/widgets/onboarding/pages/preferences_setup_page.h
index 18d6c0e8f..eed1b3aed 100644
--- a/cockatrice/src/interface/widgets/onboarding/pages/preferences_setup_page.h
+++ b/cockatrice/src/interface/widgets/onboarding/pages/preferences_setup_page.h
@@ -3,13 +3,10 @@
 
 #include "../first_run_wizard_page.h"
 
-#include <qtmetamacros.h>
-
 class QCheckBox;
 class QComboBox;
 class QGroupBox;
 class QLabel;
-class QWidget;
 
 /** @brief A curated subset of settings for the user to adjust.
  **/
diff --git a/cockatrice/src/interface/widgets/onboarding/pages/theme_setup_page.cpp b/cockatrice/src/interface/widgets/onboarding/pages/theme_setup_page.cpp
index 66554d85c..797fe4425 100644
--- a/cockatrice/src/interface/widgets/onboarding/pages/theme_setup_page.cpp
+++ b/cockatrice/src/interface/widgets/onboarding/pages/theme_setup_page.cpp
@@ -1,12 +1,10 @@
 #include "theme_setup_page.h"
 
-#include "../../../theme_config.h"
 #include "../../client/settings/cache_settings.h"
 #include "../../interface/palette_editor/palette_generator.h"
 #include "../../interface/palette_editor/quick_setup_panel.h"
 #include "../../interface/theme_manager.h"
 #include "../../interface/widgets/general/background_sources.h"
-#include "../first_run_wizard_page.h"
 #include "libcockatrice/settings/appearance_settings.h"
 
 #include <QComboBox>
@@ -14,21 +12,12 @@
 #include <QFile>
 #include <QFormLayout>
 #include <QGroupBox>
-#include <QIODevice>
-#include <QList>
-#include <QMap>
+#include <QLabel>
 #include <QMessageBox>
-#include <QObject>
 #include <QPalette>
-#include <QSharedPointer>
-#include <QStringLiteral>
 #include <QVBoxLayout>
-#include <QVariant>
-#include <QtGlobal>
-#include <initializer_list>
 #include <libcockatrice/settings/paths_settings.h>
-
-class QWidget;
+#include <libcockatrice/settings/personal_settings.h>
 
 namespace
 {
diff --git a/cockatrice/src/interface/widgets/onboarding/pages/theme_setup_page.h b/cockatrice/src/interface/widgets/onboarding/pages/theme_setup_page.h
index b0d717043..16a3c9a5d 100644
--- a/cockatrice/src/interface/widgets/onboarding/pages/theme_setup_page.h
+++ b/cockatrice/src/interface/widgets/onboarding/pages/theme_setup_page.h
@@ -3,14 +3,9 @@
 
 #include "../first_run_wizard_page.h"
 
-#include <QColor>
-#include <QString>
-#include <qtmetamacros.h>
-
 class QComboBox;
 class QGroupBox;
 class QuickSetupPanel;
-class QWidget;
 
 /** @brief First-run theme step. Reuses the same building blocks as Appearance
  *         settings and the Palette Editor (ThemeManager, PaletteConfig,
diff --git a/cockatrice/src/interface/widgets/onboarding/pages/welcome_page.cpp b/cockatrice/src/interface/widgets/onboarding/pages/welcome_page.cpp
index 71d2fa409..16e0719d2 100644
--- a/cockatrice/src/interface/widgets/onboarding/pages/welcome_page.cpp
+++ b/cockatrice/src/interface/widgets/onboarding/pages/welcome_page.cpp
@@ -3,23 +3,15 @@
 #include "../../../../main.h"
 #include "../../client/settings/cache_settings.h"
 #include "../../settings_page/general_settings_page.h"
-#include "../first_run_wizard_page.h"
 #include "libcockatrice/settings/personal_settings.h"
 
 #include <QApplication>
-#include <QChar>
 #include <QComboBox>
 #include <QHBoxLayout>
 #include <QLabel>
-#include <QList>
 #include <QLocale>
-#include <QString>
+#include <QTranslator>
 #include <QVBoxLayout>
-#include <QVariant>
-#include <QtGlobal>
-#include <qnamespace.h>
-
-class QWidget;
 
 WelcomePage::WelcomePage(QWidget *parent) : FirstRunWizardPage(parent)
 {
diff --git a/cockatrice/src/interface/widgets/onboarding/pages/welcome_page.h b/cockatrice/src/interface/widgets/onboarding/pages/welcome_page.h
index 289034ab1..93b24d83d 100644
--- a/cockatrice/src/interface/widgets/onboarding/pages/welcome_page.h
+++ b/cockatrice/src/interface/widgets/onboarding/pages/welcome_page.h
@@ -3,11 +3,8 @@
 
 #include "../first_run_wizard_page.h"
 
-#include <qtmetamacros.h>
-
 class QComboBox;
 class QLabel;
-class QWidget;
 
 class WelcomePage : public FirstRunWizardPage
 {
diff --git a/cockatrice/src/interface/widgets/onboarding/shader_banner_widget.cpp b/cockatrice/src/interface/widgets/onboarding/shader_banner_widget.cpp
index c17399957..0b9f65783 100644
--- a/cockatrice/src/interface/widgets/onboarding/shader_banner_widget.cpp
+++ b/cockatrice/src/interface/widgets/onboarding/shader_banner_widget.cpp
@@ -1,27 +1,16 @@
 #include "shader_banner_widget.h"
 
-#include "../../theme_config.h"
 #include "../../theme_manager.h"
 #include "banner_shader_config.h"
 #include "brand_colors.h"
 
 #include <QApplication>
-#include <QBrush>
-#include <QDebug>
-#include <QLinearGradient>
 #include <QPainter>
-#include <QPalette>
 #include <QQmlContext>
 #include <QQmlEngine>
 #include <QQuickWidget>
-#include <QRgb>
+#include <QResizeEvent>
 #include <QStackedLayout>
-#include <QString>
-#include <QUrl>
-#include <QtGlobal>
-#include <qmath.h>
-#include <qnamespace.h>
-#include <qnumeric.h>
 
 namespace
 {
diff --git a/cockatrice/src/interface/widgets/onboarding/shader_banner_widget.h b/cockatrice/src/interface/widgets/onboarding/shader_banner_widget.h
index 6fa0c703f..ac47b1141 100644
--- a/cockatrice/src/interface/widgets/onboarding/shader_banner_widget.h
+++ b/cockatrice/src/interface/widgets/onboarding/shader_banner_widget.h
@@ -5,8 +5,6 @@
 #include <QElapsedTimer>
 #include <QTimer>
 #include <QWidget>
-#include <QtGlobal>
-#include <qtmetamacros.h>
 
 class BannerShaderConfig;
 class QQuickWidget;
diff --git a/cockatrice/src/interface/widgets/onboarding/step_indicator_widget.cpp b/cockatrice/src/interface/widgets/onboarding/step_indicator_widget.cpp
index 004bdcc11..d25e8544b 100644
--- a/cockatrice/src/interface/widgets/onboarding/step_indicator_widget.cpp
+++ b/cockatrice/src/interface/widgets/onboarding/step_indicator_widget.cpp
@@ -1,13 +1,7 @@
 #include "step_indicator_widget.h"
 
-#include <QBrush>
-#include <QColor>
 #include <QPainter>
 #include <QPainterPath>
-#include <QPalette>
-#include <QRectF>
-#include <QSize>
-#include <QtGlobal>
 
 StepIndicatorWidget::StepIndicatorWidget(QWidget *parent) : QWidget(parent)
 {
diff --git a/cockatrice/src/interface/widgets/onboarding/step_indicator_widget.h b/cockatrice/src/interface/widgets/onboarding/step_indicator_widget.h
index d2b5dfcb5..1b85be04f 100644
--- a/cockatrice/src/interface/widgets/onboarding/step_indicator_widget.h
+++ b/cockatrice/src/interface/widgets/onboarding/step_indicator_widget.h
@@ -2,7 +2,6 @@
 #define STEP_INDICATOR_WIDGET_H
 
 #include <QWidget>
-#include <qtmetamacros.h>
 
 /** @brief Row of dots showing progress through a fixed-length sequence of steps,
  *         in the style of a mobile/OS setup flow. Purely presentational. */
diff --git a/cockatrice/src/interface/widgets/playmat/playmat_collection_dialog.cpp b/cockatrice/src/interface/widgets/playmat/playmat_collection_dialog.cpp
index f77aefb33..e970f8413 100644
--- a/cockatrice/src/interface/widgets/playmat/playmat_collection_dialog.cpp
+++ b/cockatrice/src/interface/widgets/playmat/playmat_collection_dialog.cpp
@@ -1,9 +1,6 @@
 #include "playmat_collection_dialog.h"
 
 #include "../../../client/settings/cache_settings.h"
-#include "libcockatrice/interfaces/interface_interface_settings_provider.h"
-#include "libcockatrice/utility/card_ref.h"
-#include "libcockatrice/utility/playmat_params.h"
 #include "playmat_settings_dialog.h"
 
 #include <QComboBox>
@@ -11,15 +8,10 @@
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QListWidget>
-#include <QListWidgetItem>
 #include <QPushButton>
-#include <QString>
 #include <QVBoxLayout>
-#include <QVariant>
 #include <libcockatrice/settings/interface_settings.h>
 
-class QWidget;
-
 PlaymatCollectionDialog::PlaymatCollectionDialog(QWidget *parent) : QDialog(parent)
 {
     setMinimumWidth(420);
diff --git a/cockatrice/src/interface/widgets/playmat/playmat_collection_dialog.h b/cockatrice/src/interface/widgets/playmat/playmat_collection_dialog.h
index a04cfdf54..167893f8e 100644
--- a/cockatrice/src/interface/widgets/playmat/playmat_collection_dialog.h
+++ b/cockatrice/src/interface/widgets/playmat/playmat_collection_dialog.h
@@ -2,15 +2,13 @@
 #define COCKATRICE_PLAYMAT_COLLECTION_DIALOG_H
 
 #include <QDialog>
-#include <QList>
 #include <libcockatrice/utility/playmat_params.h>
-#include <qtmetamacros.h>
 
 class QComboBox;
 class QLabel;
 class QListWidget;
+class QListWidgetItem;
 class QPushButton;
-class QWidget;
 
 /**
  * @brief Dialog for editing the user-level playmat collection.
diff --git a/cockatrice/src/interface/widgets/playmat/playmat_preview_widget.cpp b/cockatrice/src/interface/widgets/playmat/playmat_preview_widget.cpp
index 881866292..130daadf4 100644
--- a/cockatrice/src/interface/widgets/playmat/playmat_preview_widget.cpp
+++ b/cockatrice/src/interface/widgets/playmat/playmat_preview_widget.cpp
@@ -3,22 +3,13 @@
 #include "../cards/art_crop_attribution.h"
 #include "playmat_utils.h"
 
-#include <QBrush>
-#include <QColor>
-#include <QFlags>
 #include <QKeyEvent>
 #include <QLinearGradient>
 #include <QMouseEvent>
 #include <QPainter>
-#include <QPalette>
-#include <QPen>
-#include <QPointF>
-#include <QRect>
-#include <QSizePolicy>
+#include <QPainterPath>
 #include <QWheelEvent>
-#include <QtGlobal>
 #include <cmath>
-#include <qnamespace.h>
 
 namespace
 {
diff --git a/cockatrice/src/interface/widgets/playmat/playmat_preview_widget.h b/cockatrice/src/interface/widgets/playmat/playmat_preview_widget.h
index 5e54e96eb..88b9ec41d 100644
--- a/cockatrice/src/interface/widgets/playmat/playmat_preview_widget.h
+++ b/cockatrice/src/interface/widgets/playmat/playmat_preview_widget.h
@@ -1,15 +1,10 @@
 #ifndef COCKATRICE_PLAYMAT_PREVIEW_WIDGET_H
 #define COCKATRICE_PLAYMAT_PREVIEW_WIDGET_H
 
-#include "libcockatrice/utility/playmat_params.h"
-
+#include <QFocusEvent>
 #include <QPixmap>
-#include <QPoint>
-#include <QRectF>
-#include <QString>
 #include <QWidget>
-#include <QtGlobal>
-#include <qtmetamacros.h>
+#include <libcockatrice/deck_list/deck_list.h>
 
 /**
  * @brief Interactive crop surface showing how a playmat card art will appear
diff --git a/cockatrice/src/interface/widgets/playmat/playmat_settings_dialog.cpp b/cockatrice/src/interface/widgets/playmat/playmat_settings_dialog.cpp
index 5a4457d34..9459c5ea9 100644
--- a/cockatrice/src/interface/widgets/playmat/playmat_settings_dialog.cpp
+++ b/cockatrice/src/interface/widgets/playmat/playmat_settings_dialog.cpp
@@ -6,11 +6,6 @@
 #include "../utility/completer_utils.h"
 #include "card_database_display_model.h"
 #include "card_database_model.h"
-#include "libcockatrice/card/card_info.h"
-#include "libcockatrice/card/database/card_database_querier.h"
-#include "libcockatrice/card/printing/exact_card.h"
-#include "libcockatrice/card/printing/printing_info.h"
-#include "libcockatrice/card/set/card_set.h"
 #include "playmat_preview_widget.h"
 
 #include <QCheckBox>
@@ -20,18 +15,14 @@
 #include <QDoubleSpinBox>
 #include <QFormLayout>
 #include <QGroupBox>
+#include <QHBoxLayout>
 #include <QLabel>
 #include <QLineEdit>
-#include <QList>
+#include <QPainter>
+#include <QPainterPath>
 #include <QPushButton>
-#include <QSharedPointer>
-#include <QSignalBlocker>
-#include <QSize>
 #include <QVBoxLayout>
-#include <QVariant>
 #include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/utility/card_ref.h>
-#include <qnamespace.h>
 
 PlaymatSettingsDialog::PlaymatSettingsDialog(const CardRef &initialCard,
                                              const PlaymatParams &initialParams,
diff --git a/cockatrice/src/interface/widgets/playmat/playmat_settings_dialog.h b/cockatrice/src/interface/widgets/playmat/playmat_settings_dialog.h
index 07833af25..9ef306a5f 100644
--- a/cockatrice/src/interface/widgets/playmat/playmat_settings_dialog.h
+++ b/cockatrice/src/interface/widgets/playmat/playmat_settings_dialog.h
@@ -1,14 +1,9 @@
 #ifndef COCKATRICE_PLAYMAT_SETTINGS_DIALOG_H
 #define COCKATRICE_PLAYMAT_SETTINGS_DIALOG_H
 
-#include "libcockatrice/utility/card_ref.h"
-#include "libcockatrice/utility/playmat_params.h"
-
 #include <QDialog>
-#include <QMetaObject>
 #include <QPixmap>
-#include <QString>
-#include <qtmetamacros.h>
+#include <libcockatrice/deck_list/deck_list.h>
 
 class QCheckBox;
 class QComboBox;
diff --git a/cockatrice/src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp b/cockatrice/src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp
index bad88ddbb..579106540 100644
--- a/cockatrice/src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp
+++ b/cockatrice/src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp
@@ -1,21 +1,8 @@
 #include "all_zones_card_amount_widget.h"
 
 #include "../general/display/shadow_background_label.h"
-#include "card_amount_widget.h"
-#include "libcockatrice/card/card_info.h"
-#include "libcockatrice/card/printing/exact_card.h"
-#include "libcockatrice/deck_list/tree/inner_deck_list_node.h"
 
-#include <QFont>
-#include <QLabel>
-#include <QSizePolicy>
-#include <QSlider>
 #include <QTimer>
-#include <QVBoxLayout>
-#include <algorithm>
-#include <qnamespace.h>
-
-class DeckStateManager;
 
 /**
  * @brief Constructor for the AllZonesCardAmountWidget class.
diff --git a/cockatrice/src/interface/widgets/printing_selector/all_zones_card_amount_widget.h b/cockatrice/src/interface/widgets/printing_selector/all_zones_card_amount_widget.h
index cefabe293..325dd1c1b 100644
--- a/cockatrice/src/interface/widgets/printing_selector/all_zones_card_amount_widget.h
+++ b/cockatrice/src/interface/widgets/printing_selector/all_zones_card_amount_widget.h
@@ -7,15 +7,11 @@
 
 #ifndef ALL_ZONES_CARD_AMOUNT_WIDGET_H
 #define ALL_ZONES_CARD_AMOUNT_WIDGET_H
-#include <QWidget>
-#include <qtmetamacros.h>
+#include "../../deck_loader/deck_loader.h"
+#include "card_amount_widget.h"
 
-class CardAmountWidget;
-class DeckStateManager;
-class ExactCard;
-class QLabel;
-class QSlider;
-class QVBoxLayout;
+#include <QWidget>
+#include <libcockatrice/models/deck_list/deck_list_model.h>
 
 class AllZonesCardAmountWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.cpp b/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.cpp
index 4b5040741..ff47e7b9c 100644
--- a/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.cpp
+++ b/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.cpp
@@ -1,30 +1,9 @@
 #include "card_amount_widget.h"
 
 #include "../deck_editor/deck_state_manager.h"
-#include "../general/display/dynamic_font_size_push_button.h"
-#include "deck_list_model.h"
-#include "libcockatrice/card/printing/printing_info.h"
-#include "libcockatrice/card/set/card_set.h"
-#include "libcockatrice/deck_list/tree/inner_deck_list_node.h"
 
-#include <QBrush>
-#include <QColor>
-#include <QFont>
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QModelIndex>
 #include <QPainter>
-#include <QPushButton>
-#include <QSharedPointer>
-#include <QSize>
-#include <QSizePolicy>
-#include <QSlider>
-#include <QVariant>
-#include <algorithm>
-#include <functional>
-#include <qnamespace.h>
-
-class QModelIndex;
+#include <QTimer>
 
 /**
  * @brief Constructs a widget for displaying and controlling the card count in a specific zone.
diff --git a/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.h b/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.h
index 6f5889fc7..2780e3ad2 100644
--- a/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.h
+++ b/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.h
@@ -8,17 +8,15 @@
 #ifndef CARD_AMOUNT_WIDGET_H
 #define CARD_AMOUNT_WIDGET_H
 
-#include "libcockatrice/card/printing/exact_card.h"
+#include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
+#include "../general/display/dynamic_font_size_push_button.h"
 
-#include <QString>
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QTreeView>
 #include <QWidget>
-#include <qtmetamacros.h>
-
-class DeckStateManager;
-class DynamicFontSizePushButton;
-class QHBoxLayout;
-class QLabel;
-class QSlider;
+#include <libcockatrice/card/card_info.h>
+#include <libcockatrice/models/deck_list/deck_list_model.h>
 
 class CardAmountWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector.cpp b/cockatrice/src/interface/widgets/printing_selector/printing_selector.cpp
index 27ae61b94..f16b4885c 100644
--- a/cockatrice/src/interface/widgets/printing_selector/printing_selector.cpp
+++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector.cpp
@@ -1,38 +1,19 @@
 #include "printing_selector.h"
 
 #include "../../../client/settings/cache_settings.h"
-#include "../cards/card_size_widget.h"
+#include "../../../interface/card_picture_loader/card_picture_loader.h"
+#include "../../../interface/widgets/dialogs/dlg_select_set_for_cards.h"
 #include "../deck_editor/deck_state_manager.h"
-#include "../general/layout_containers/flow_widget.h"
-#include "../quick_settings/settings_button_widget.h"
-#include "../tabs/abstract_tab_deck_editor.h"
-#include "deck_list_model.h"
-#include "libcockatrice/card/card_info.h"
-#include "libcockatrice/card/printing/exact_card.h"
-#include "libcockatrice/card/printing/printing_info.h"
-#include "libcockatrice/deck_list/tree/deck_list_card_node.h"
-#include "libcockatrice/deck_list/tree/inner_deck_list_node.h"
 #include "printing_selector_card_display_widget.h"
 #include "printing_selector_card_search_widget.h"
 #include "printing_selector_card_selection_widget.h"
 #include "printing_selector_card_sorting_widget.h"
 #include "printing_selector_placeholder_widget.h"
 
-#include <QCheckBox>
-#include <QDebug>
-#include <QHBoxLayout>
-#include <QList>
-#include <QMap>
-#include <QScrollArea>
+#include <QBoxLayout>
 #include <QScrollBar>
-#include <QSharedPointer>
-#include <QSizePolicy>
-#include <QString>
-#include <QTimer>
-#include <QVBoxLayout>
 #include <libcockatrice/settings/cards_display_settings.h>
 #include <libcockatrice/utility/macros.h>
-#include <qnamespace.h>
 
 /**
  * @brief Constructs a PrintingSelector widget to display and manage card printings.
diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector.h b/cockatrice/src/interface/widgets/printing_selector/printing_selector.h
index b9cb27ecd..14d73f836 100644
--- a/cockatrice/src/interface/widgets/printing_selector/printing_selector.h
+++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector.h
@@ -7,20 +7,18 @@
 #ifndef PRINTING_SELECTOR_H
 #define PRINTING_SELECTOR_H
 
+#include "../cards/card_size_widget.h"
+#include "../general/layout_containers/flow_widget.h"
+#include "../quick_settings/settings_button_widget.h"
+#include "printing_selector_placeholder_widget.h"
+
+#include <QCheckBox>
+#include <QLabel>
+#include <QTreeView>
+#include <QVBoxLayout>
 #include <QWidget>
 #include <libcockatrice/card/card_info.h>
-#include <qtmetamacros.h>
-
-class CardSizeWidget;
-class FlowWidget;
-class PrintingSelectorPlaceholderWidget;
-class QCheckBox;
-class QHBoxLayout;
-class QString;
-class QTimer;
-class QVBoxLayout;
-class SettingsButtonWidget;
-template <class Key, class T> class QMap;
+#include <libcockatrice/models/deck_list/deck_list_model.h>
 
 #define BATCH_SIZE 10
 
@@ -35,8 +33,8 @@ class DeckStateManager;
 class PrintingSelectorCardSearchWidget;
 class PrintingSelectorCardSelectionWidget;
 class PrintingSelectorCardSortingWidget;
+class PrintingSelectorViewOptionsWidget;
 class AbstractTabDeckEditor;
-
 class PrintingSelector : public QWidget
 {
     Q_OBJECT
diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_display_widget.cpp b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_display_widget.cpp
index 1c3cb635d..edeba86d1 100644
--- a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_display_widget.cpp
@@ -1,22 +1,11 @@
 #include "printing_selector_card_display_widget.h"
 
-#include "libcockatrice/card/card_info.h"
-#include "libcockatrice/card/printing/printing_info.h"
-#include "libcockatrice/card/set/card_set.h"
-#include "printing_selector.h"
 #include "printing_selector_card_overlay_widget.h"
 #include "set_name_and_collectors_number_display_widget.h"
 
-#include <QMap>
-#include <QSharedPointer>
-#include <QSizePolicy>
-#include <QString>
+#include <QGraphicsEffect>
 #include <QVBoxLayout>
-#include <qnamespace.h>
-
-class AbstractTabDeckEditor;
-class DeckStateManager;
-class QSlider;
+#include <utility>
 
 /**
  * @brief Constructs a PrintingSelectorCardDisplayWidget to display card information.
diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_display_widget.h b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_display_widget.h
index f0a378fd3..4de561f4f 100644
--- a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_display_widget.h
+++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_display_widget.h
@@ -7,25 +7,12 @@
 #ifndef PRINTING_SELECTOR_CARD_DISPLAY_WIDGET_H
 #define PRINTING_SELECTOR_CARD_DISPLAY_WIDGET_H
 
-#include "libcockatrice/card/printing/exact_card.h"
-
-// IWYU pragma: keep
-// ZoneCounts appears inside a QMap in a slot signature, so the moc-generated
-// code needs the complete type.
-#include "printing_selector.h"
+#include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
+#include "printing_selector_card_overlay_widget.h"
+#include "set_name_and_collectors_number_display_widget.h"
 
 #include <QWidget>
-#include <qtmetamacros.h>
-
-class AbstractTabDeckEditor;
-class DeckStateManager;
-class PrintingSelectorCardOverlayWidget;
-class QSlider;
-class QString;
-class QVBoxLayout;
-class SetNameAndCollectorsNumberDisplayWidget;
-struct ZoneCounts;
-template <class Key, class T> class QMap;
+#include <libcockatrice/models/deck_list/deck_list_model.h>
 
 class PrintingSelectorCardDisplayWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp
index bec9100a6..e8816847e 100644
--- a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp
+++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp
@@ -3,46 +3,23 @@
 #include "../../../client/settings/cache_settings.h"
 #include "../../card_picture_loader/card_picture_loader.h"
 #include "../cards/card_info_picture_widget.h"
-#include "../tabs/abstract_tab_deck_editor.h"
-#include "all_zones_card_amount_widget.h"
-#include "libcockatrice/card/card_info.h"
-#include "libcockatrice/card/database/card_database_querier.h"
-#include "libcockatrice/card/printing/printing_info.h"
-#include "libcockatrice/card/set/card_set.h"
+#include "printing_selector_card_display_widget.h"
 
-#include <QAction>
 #include <QApplication>
-#include <QDebug>
 #include <QFileDialog>
-#include <QGuiApplication>
-#include <QImage>
 #include <QImageReader>
 #include <QLabel>
-#include <QList>
 #include <QMenu>
 #include <QMessageBox>
 #include <QMouseEvent>
-#include <QPixmap>
 #include <QPixmapCache>
-#include <QPoint>
-#include <QRect>
 #include <QScreen>
-#include <QSharedPointer>
-#include <QSize>
-#include <QSizeF>
-#include <QSlider>
-#include <QString>
-#include <QStringLiteral>
 #include <QVBoxLayout>
-#include <QVariant>
-#include <QtGlobal>
 #include <QtMath>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/card/relation/card_relation.h>
 #include <libcockatrice/settings/card_override_settings.h>
-#include <qnamespace.h>
-
-class DeckStateManager;
+#include <utility>
 
 namespace
 {
diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.h b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.h
index 20d8f7b4b..fbcfa9230 100644
--- a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.h
+++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.h
@@ -7,20 +7,14 @@
 #ifndef PRINTING_SELECTOR_CARD_OVERLAY_WIDGET_H
 #define PRINTING_SELECTOR_CARD_OVERLAY_WIDGET_H
 
-#include "libcockatrice/card/printing/exact_card.h"
+#include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
+#include "all_zones_card_amount_widget.h"
+#include "set_name_and_collectors_number_display_widget.h"
 
-#include <QWidget>
-#include <qtmetamacros.h>
+#include <libcockatrice/models/deck_list/deck_list_model.h>
 
 class QAction;
 class QMenu;
-class AbstractTabDeckEditor;
-class AllZonesCardAmountWidget;
-class CardInfoPictureWidget;
-class DeckStateManager;
-class QLabel;
-class QPoint;
-class QSlider;
 
 class PrintingSelectorCardOverlayWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_search_widget.cpp b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_search_widget.cpp
index 718e24ea0..3c42f06dc 100644
--- a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_search_widget.cpp
+++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_search_widget.cpp
@@ -1,11 +1,5 @@
 #include "printing_selector_card_search_widget.h"
 
-#include "printing_selector.h"
-
-#include <QHBoxLayout>
-#include <QLineEdit>
-#include <QTimer>
-
 /**
  * @brief Constructs a PrintingSelectorCardSearchWidget for searching cards by set name or set code.
  *
diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_search_widget.h b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_search_widget.h
index d54cf5fbc..3efabe13c 100644
--- a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_search_widget.h
+++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_search_widget.h
@@ -7,14 +7,11 @@
 #ifndef PRINTING_SELECTOR_CARD_SEARCH_WIDGET_H
 #define PRINTING_SELECTOR_CARD_SEARCH_WIDGET_H
 
-#include <QString>
-#include <QWidget>
-#include <qtmetamacros.h>
+#include "printing_selector.h"
 
-class PrintingSelector;
-class QHBoxLayout;
-class QLineEdit;
-class QTimer;
+#include <QLineEdit>
+#include <QTimer>
+#include <QWidget>
 
 class PrintingSelectorCardSearchWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp
index da66591b3..2eb2ef245 100644
--- a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp
+++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp
@@ -1,12 +1,7 @@
 #include "printing_selector_card_selection_widget.h"
 
 #include "../../../interface/widgets/dialogs/dlg_select_set_for_cards.h"
-#include "printing_selector.h"
-
-#include <QHBoxLayout>
-#include <QPushButton>
-
-class DeckStateManager;
+#include "../tabs/abstract_tab_deck_editor.h"
 
 /**
  * @brief Constructs a PrintingSelectorCardSelectionWidget for navigating through cards in the deck.
diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_selection_widget.h b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_selection_widget.h
index c619c5327..0aa56c9d8 100644
--- a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_selection_widget.h
+++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_selection_widget.h
@@ -7,13 +7,11 @@
 #ifndef PRINTING_SELECTOR_CARD_SELECTION_WIDGET_H
 #define PRINTING_SELECTOR_CARD_SELECTION_WIDGET_H
 
-#include <QWidget>
-#include <qtmetamacros.h>
+#include "printing_selector.h"
 
-class DeckStateManager;
-class PrintingSelector;
-class QHBoxLayout;
-class QPushButton;
+#include <QHBoxLayout>
+#include <QPushButton>
+#include <QWidget>
 
 class PrintingSelectorCardSelectionWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp
index f47ba0746..f4a05cfc7 100644
--- a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp
+++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp
@@ -1,26 +1,11 @@
 #include "printing_selector_card_sorting_widget.h"
 
 #include "../../../client/settings/cache_settings.h"
-#include "deck_list_model.h"
-#include "libcockatrice/card/set/card_set.h"
-#include "libcockatrice/deck_list/tree/inner_deck_list_node.h"
-#include "printing_selector.h"
 
-#include <QComboBox>
-#include <QDate>
-#include <QHBoxLayout>
-#include <QModelIndex>
-#include <QPair>
-#include <QPushButton>
-#include <QSharedPointer>
-#include <QVariant>
-#include <algorithm>
 #include <libcockatrice/card/set/card_set_comparator.h>
 #include <libcockatrice/settings/card_database_settings.h>
 #include <libcockatrice/settings/card_override_settings.h>
 #include <libcockatrice/settings/cards_display_settings.h>
-#include <qnamespace.h>
-#include <utility>
 
 const QString PrintingSelectorCardSortingWidget::SORT_OPTIONS_ALPHABETICAL = tr("Alphabetical");
 const QString PrintingSelectorCardSortingWidget::SORT_OPTIONS_PREFERENCE = tr("Preference");
diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.h b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.h
index 1cd99457b..bb5b60cdc 100644
--- a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.h
+++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.h
@@ -7,20 +7,11 @@
 #ifndef PRINTING_SELECTOR_CARD_SORTING_WIDGET_H
 #define PRINTING_SELECTOR_CARD_SORTING_WIDGET_H
 
-#include "libcockatrice/card/card_info.h"
-#include "libcockatrice/card/printing/printing_info.h"
+#include "printing_selector.h"
 
-#include <QList>
-#include <QString>
-#include <QStringList>
+#include <QComboBox>
+#include <QPushButton>
 #include <QWidget>
-#include <qtmetamacros.h>
-
-class DeckListModel;
-class PrintingSelector;
-class QComboBox;
-class QHBoxLayout;
-class QPushButton;
 
 class PrintingSelectorCardSortingWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector_placeholder_widget.cpp b/cockatrice/src/interface/widgets/printing_selector/printing_selector_placeholder_widget.cpp
index 7f9ad66c8..aee34bccd 100644
--- a/cockatrice/src/interface/widgets/printing_selector/printing_selector_placeholder_widget.cpp
+++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector_placeholder_widget.cpp
@@ -1,10 +1,5 @@
 #include "printing_selector_placeholder_widget.h"
 
-#include <QLabel>
-#include <QSizePolicy>
-#include <QVBoxLayout>
-#include <qnamespace.h>
-
 PrintingSelectorPlaceholderWidget::PrintingSelectorPlaceholderWidget(QWidget *parent) : QWidget(parent)
 {
     setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector_placeholder_widget.h b/cockatrice/src/interface/widgets/printing_selector/printing_selector_placeholder_widget.h
index 6702d325a..abf030c69 100644
--- a/cockatrice/src/interface/widgets/printing_selector/printing_selector_placeholder_widget.h
+++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector_placeholder_widget.h
@@ -1,11 +1,9 @@
 #ifndef COCKATRICE_PRINTING_SELECTOR_PLACEHOLDER_WIDGET_H
 #define COCKATRICE_PRINTING_SELECTOR_PLACEHOLDER_WIDGET_H
 
+#include <QLabel>
+#include <QVBoxLayout>
 #include <QWidget>
-#include <qtmetamacros.h>
-
-class QLabel;
-class QVBoxLayout;
 
 class PrintingSelectorPlaceholderWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/printing_selector/set_name_and_collectors_number_display_widget.cpp b/cockatrice/src/interface/widgets/printing_selector/set_name_and_collectors_number_display_widget.cpp
index 9bc92ad90..e12775a04 100644
--- a/cockatrice/src/interface/widgets/printing_selector/set_name_and_collectors_number_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/printing_selector/set_name_and_collectors_number_display_widget.cpp
@@ -1,11 +1,6 @@
 #include "set_name_and_collectors_number_display_widget.h"
 
-#include <QFontMetrics>
-#include <QLabel>
-#include <QRect>
-#include <QSizePolicy>
-#include <QVBoxLayout>
-#include <qnamespace.h>
+#include <QSlider>
 
 /**
  * @class SetNameAndCollectorsNumberDisplayWidget
diff --git a/cockatrice/src/interface/widgets/printing_selector/set_name_and_collectors_number_display_widget.h b/cockatrice/src/interface/widgets/printing_selector/set_name_and_collectors_number_display_widget.h
index 54e580b67..140f190df 100644
--- a/cockatrice/src/interface/widgets/printing_selector/set_name_and_collectors_number_display_widget.h
+++ b/cockatrice/src/interface/widgets/printing_selector/set_name_and_collectors_number_display_widget.h
@@ -8,12 +8,10 @@
 #ifndef SET_NAME_AND_COLLECTORS_NUMBER_DISPLAY_WIDGET_H
 #define SET_NAME_AND_COLLECTORS_NUMBER_DISPLAY_WIDGET_H
 
-#include <QString>
+#include <QLabel>
+#include <QSlider>
+#include <QVBoxLayout>
 #include <QWidget>
-#include <qtmetamacros.h>
-
-class QLabel;
-class QVBoxLayout;
 
 class SetNameAndCollectorsNumberDisplayWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/quick_settings/settings_button_widget.cpp b/cockatrice/src/interface/widgets/quick_settings/settings_button_widget.cpp
index 981ed843c..881c3e3ac 100644
--- a/cockatrice/src/interface/widgets/quick_settings/settings_button_widget.cpp
+++ b/cockatrice/src/interface/widgets/quick_settings/settings_button_widget.cpp
@@ -1,21 +1,11 @@
 #include "settings_button_widget.h"
 
 #include "../../pixel_map_generator.h"
-#include "settings_popup_widget.h"
 
 #include <QApplication>
 #include <QHBoxLayout>
 #include <QMouseEvent>
-#include <QPixmap>
-#include <QPoint>
-#include <QPointF>
-#include <QRect>
 #include <QScreen>
-#include <QSize>
-#include <QSizePolicy>
-#include <QStringLiteral>
-#include <QToolButton>
-#include <qnamespace.h>
 
 SettingsButtonWidget::SettingsButtonWidget(QWidget *parent)
     : QWidget(parent), button(new QToolButton(this)), popup(new SettingsPopupWidget(nullptr))
diff --git a/cockatrice/src/interface/widgets/quick_settings/settings_button_widget.h b/cockatrice/src/interface/widgets/quick_settings/settings_button_widget.h
index 015300bf8..1dc52ac72 100644
--- a/cockatrice/src/interface/widgets/quick_settings/settings_button_widget.h
+++ b/cockatrice/src/interface/widgets/quick_settings/settings_button_widget.h
@@ -8,14 +8,10 @@
 #ifndef SETTINGS_BUTTON_WIDGET_H
 #define SETTINGS_BUTTON_WIDGET_H
 
-#include <QString>
-#include <QWidget>
-#include <qtmetamacros.h>
+#include "settings_popup_widget.h"
 
-class QHBoxLayout;
-class QPixmap;
-class QToolButton;
-class SettingsPopupWidget;
+#include <QToolButton>
+#include <QWidget>
 
 class SettingsButtonWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/quick_settings/settings_popup_widget.cpp b/cockatrice/src/interface/widgets/quick_settings/settings_popup_widget.cpp
index 7ace155a7..8389caea9 100644
--- a/cockatrice/src/interface/widgets/quick_settings/settings_popup_widget.cpp
+++ b/cockatrice/src/interface/widgets/quick_settings/settings_popup_widget.cpp
@@ -1,14 +1,10 @@
 #include "settings_popup_widget.h"
 
 #include <QApplication>
-#include <QFrame>
+#include <QFocusEvent>
 #include <QPainter>
-#include <QRect>
 #include <QScreen>
 #include <QScrollArea>
-#include <QSize>
-#include <QVBoxLayout>
-#include <qnamespace.h>
 
 SettingsPopupWidget::SettingsPopupWidget(QWidget *parent) : QWidget(parent, Qt::Popup | Qt::FramelessWindowHint)
 {
diff --git a/cockatrice/src/interface/widgets/quick_settings/settings_popup_widget.h b/cockatrice/src/interface/widgets/quick_settings/settings_popup_widget.h
index 61b2cb013..01e86abfe 100644
--- a/cockatrice/src/interface/widgets/quick_settings/settings_popup_widget.h
+++ b/cockatrice/src/interface/widgets/quick_settings/settings_popup_widget.h
@@ -8,11 +8,10 @@
 #ifndef SETTINGS_POPUP_WIDGET_H
 #define SETTINGS_POPUP_WIDGET_H
 
+#include <QLabel>
+#include <QScrollArea>
+#include <QVBoxLayout>
 #include <QWidget>
-#include <qtmetamacros.h>
-
-class QScrollArea;
-class QVBoxLayout;
 
 class SettingsPopupWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/replay/replay_manager.cpp b/cockatrice/src/interface/widgets/replay/replay_manager.cpp
index f3f1da2c4..c51b96b6c 100644
--- a/cockatrice/src/interface/widgets/replay/replay_manager.cpp
+++ b/cockatrice/src/interface/widgets/replay/replay_manager.cpp
@@ -1,16 +1,10 @@
 #include "replay_manager.h"
 
 #include "../../../client/settings/cache_settings.h"
-#include "../../../game/player/event_processing_options.h"
-#include "libcockatrice/protocol/pb/game_event.pb.h"
-#include "libcockatrice/protocol/pb/game_event_container.pb.h"
-#include "libcockatrice/protocol/pb/game_replay.pb.h"
 
 #include <QTimer>
-#include <algorithm>
 #include <libcockatrice/protocol/get_pb_extension.h>
 #include <libcockatrice/settings/interface_settings.h>
-#include <qnumeric.h>
 
 static constexpr int TIMER_INTERVAL_MS = 200;
 static constexpr int EMPTY_SECTION_MARGIN_MS = 500;
diff --git a/cockatrice/src/interface/widgets/replay/replay_manager.h b/cockatrice/src/interface/widgets/replay/replay_manager.h
index 3b33deada..81e66824d 100644
--- a/cockatrice/src/interface/widgets/replay/replay_manager.h
+++ b/cockatrice/src/interface/widgets/replay/replay_manager.h
@@ -3,14 +3,11 @@
 
 #include "../../../game/player/event_processing_options.h"
 
-#include <QList>
 #include <QObject>
-#include <QtGlobal>
-#include <qtmetamacros.h>
+#include <libcockatrice/protocol/pb/game_replay.pb.h>
 
 class GameReplay;
 class QTimer;
-class GameEventContainer;
 
 /**
  * @brief This class handles all logic to do with playing back replays
diff --git a/cockatrice/src/interface/widgets/replay/replay_quick_settings_widget.cpp b/cockatrice/src/interface/widgets/replay/replay_quick_settings_widget.cpp
index 5b3829af2..5d58705d2 100644
--- a/cockatrice/src/interface/widgets/replay/replay_quick_settings_widget.cpp
+++ b/cockatrice/src/interface/widgets/replay/replay_quick_settings_widget.cpp
@@ -1,14 +1,10 @@
 #include "replay_quick_settings_widget.h"
 
 #include "../../../client/settings/cache_settings.h"
-#include "../quick_settings/settings_button_widget.h"
-#include "libcockatrice/utility/macros.h"
 
-#include <QDebug>
 #include <QGridLayout>
 #include <QLabel>
 #include <QWidget>
-#include <QtGlobal>
 #include <libcockatrice/settings/interface_settings.h>
 #include <libcockatrice/settings/personal_settings.h>
 
diff --git a/cockatrice/src/interface/widgets/replay/replay_quick_settings_widget.h b/cockatrice/src/interface/widgets/replay/replay_quick_settings_widget.h
index d0be7d58d..a337ea0a6 100644
--- a/cockatrice/src/interface/widgets/replay/replay_quick_settings_widget.h
+++ b/cockatrice/src/interface/widgets/replay/replay_quick_settings_widget.h
@@ -5,12 +5,7 @@
 
 #include <QCheckBox>
 #include <QDoubleSpinBox>
-#include <QLabel>
-#include <QtGlobal>
 #include <libcockatrice/utility/macros.h>
-#include <qtmetamacros.h>
-
-class QWidget;
 
 class ReplayQuickSettingsWidget : public SettingsButtonWidget
 {
diff --git a/cockatrice/src/interface/widgets/replay/replay_timeline_widget.cpp b/cockatrice/src/interface/widgets/replay/replay_timeline_widget.cpp
index 48a43dba8..fe4ac330b 100644
--- a/cockatrice/src/interface/widgets/replay/replay_timeline_widget.cpp
+++ b/cockatrice/src/interface/widgets/replay/replay_timeline_widget.cpp
@@ -1,15 +1,9 @@
 #include "replay_timeline_widget.h"
 
-#include <QBrush>
-#include <QColor>
-#include <QMouseEvent>
+#include "../../../client/settings/cache_settings.h"
+
 #include <QPainter>
 #include <QPainterPath>
-#include <QPointF>
-#include <QSize>
-#include <QtGlobal>
-#include <qnamespace.h>
-#include <qnumeric.h>
 
 static constexpr int BIN_LENGTH = 5000;
 static constexpr int MIN_RESOLUTION_MS = 1000;
diff --git a/cockatrice/src/interface/widgets/replay/replay_timeline_widget.h b/cockatrice/src/interface/widgets/replay/replay_timeline_widget.h
index 2c277228f..47d19a741 100644
--- a/cockatrice/src/interface/widgets/replay/replay_timeline_widget.h
+++ b/cockatrice/src/interface/widgets/replay/replay_timeline_widget.h
@@ -7,9 +7,13 @@
 #ifndef REPLAY_TIMELINE_WIDGET
 #define REPLAY_TIMELINE_WIDGET
 
-#include <QList>
+#include "../../../game/player/event_processing_options.h"
+
+#include <QMouseEvent>
 #include <QWidget>
-#include <qtmetamacros.h>
+
+class QPaintEvent;
+class QTimer;
 
 class ReplayTimelineWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/replay/replay_widget.cpp b/cockatrice/src/interface/widgets/replay/replay_widget.cpp
index 07b4e72ce..c92771f8c 100644
--- a/cockatrice/src/interface/widgets/replay/replay_widget.cpp
+++ b/cockatrice/src/interface/widgets/replay/replay_widget.cpp
@@ -3,21 +3,12 @@
 #include "../../../client/settings/cache_settings.h"
 #include "../../../client/settings/shortcuts_settings.h"
 #include "../../pixel_map_generator.h"
-#include "libcockatrice/settings/interface_settings.h"
+#include "../interface/widgets/tabs/tab_game.h"
 #include "replay_manager.h"
 #include "replay_quick_settings_widget.h"
-#include "replay_timeline_widget.h"
 
-#include <QAction>
 #include <QHBoxLayout>
-#include <QIcon>
-#include <QSize>
-#include <QString>
-#include <QStringLiteral>
 #include <QToolButton>
-#include <QtGlobal>
-
-class GameReplay;
 
 ReplayWidget::ReplayWidget(QWidget *parent, GameReplay *replay)
     : QWidget(parent), replayPlayButton(nullptr), replayFastForwardButton(nullptr), aReplaySkipForward(nullptr),
diff --git a/cockatrice/src/interface/widgets/replay/replay_widget.h b/cockatrice/src/interface/widgets/replay/replay_widget.h
index 74aace570..6d2b7a043 100644
--- a/cockatrice/src/interface/widgets/replay/replay_widget.h
+++ b/cockatrice/src/interface/widgets/replay/replay_widget.h
@@ -8,18 +8,15 @@
 #ifndef REPLAY_WIDGET_H
 #define REPLAY_WIDGET_H
 
-#include "../../../game/player/event_processing_options.h"
+#include "replay_timeline_widget.h"
 
+#include <QToolButton>
 #include <QWidget>
-#include <qtmetamacros.h>
+#include <libcockatrice/protocol/pb/game_replay.pb.h>
 
 class ReplayManager;
 class ReplayQuickSettingsWidget;
-class GameEventContainer;
-class GameReplay;
-class QAction;
-class QToolButton;
-class ReplayTimelineWidget;
+class TabGame;
 
 /**
  * @brief The top-level widget that is put in the replay dock widget.
diff --git a/cockatrice/src/interface/widgets/server/chat_view/chat_view.cpp b/cockatrice/src/interface/widgets/server/chat_view/chat_view.cpp
index 037a4a1e5..91a7cb965 100644
--- a/cockatrice/src/interface/widgets/server/chat_view/chat_view.cpp
+++ b/cockatrice/src/interface/widgets/server/chat_view/chat_view.cpp
@@ -4,47 +4,22 @@
 #include "../../client/sound_engine.h"
 #include "../../interface/card_localization.h"
 #include "../../interface/pixel_map_generator.h"
-#include "../../tabs/tab_supervisor.h"
+#include "../../interface/widgets/tabs/tab_account.h"
 #include "../user/user_context_menu.h"
 #include "../user/user_list_manager.h"
 #include "../user/user_list_proxy.h"
-#include "libcockatrice/card/card_info.h"
-#include "libcockatrice/card/database/card_database_querier.h"
-#include "libcockatrice/protocol/pb/event_room_say.pb.h"
-#include "room_message_type.h"
 
 #include <QApplication>
-#include <QBrush>
-#include <QChar>
 #include <QDateTime>
 #include <QDesktopServices>
-#include <QFlag>
-#include <QFlags>
-#include <QFont>
-#include <QFontInfo>
 #include <QMouseEvent>
-#include <QPalette>
-#include <QPixmap>
-#include <QPointF>
-#include <QRegularExpression>
-#include <QRegularExpressionMatch>
 #include <QScrollBar>
-#include <QSharedPointer>
-#include <QTextBlockFormat>
-#include <QTextDocument>
 #include <QTimer>
 #include <QUrl>
 #include <QUrlQuery>
-#include <QWidget>
-#include <QtGlobal>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/network/server/remote/user_level.h>
 #include <libcockatrice/settings/chat_settings.h>
-#include <libcockatrice/utility/card_ref.h>
-#include <qnamespace.h>
-#include <qobjectdefs.h>
-
-class QPoint;
 
 const QColor DEFAULT_MENTION_COLOR = QColor(194, 31, 47);
 
diff --git a/cockatrice/src/interface/widgets/server/chat_view/chat_view.h b/cockatrice/src/interface/widgets/server/chat_view/chat_view.h
index 3fa7224e5..06e3a0ed8 100644
--- a/cockatrice/src/interface/widgets/server/chat_view/chat_view.h
+++ b/cockatrice/src/interface/widgets/server/chat_view/chat_view.h
@@ -8,34 +8,22 @@
 #ifndef CHATVIEW_H
 #define CHATVIEW_H
 
-#include "libcockatrice/protocol/pb/serverinfo_user.pb.h"
+#include "../../interface/widgets/tabs/tab_supervisor.h"
+#include "../user/user_list_widget.h"
 
+#include <QAction>
 #include <QColor>
-#include <QDateTime>
-#include <QList>
-#include <QMap>
-#include <QString>
-#include <QStringList>
-#include <QTextBlock>
 #include <QTextBrowser>
-#include <QTextCharFormat>
 #include <QTextCursor>
 #include <QTextFragment>
-#include <QVector>
 #include <libcockatrice/network/server/remote/room_message_type.h>
 #include <libcockatrice/network/server/remote/user_level.h>
-#include <qtmetamacros.h>
 
 class AbstractGame;
+class QTextTable;
+class QMouseEvent;
 class UserContextMenu;
 class UserListProxy;
-class QAction;
-class QPoint;
-class QUrl;
-class QWidget;
-class TabSupervisor;
-struct CardRef;
-template <typename Enum> class QFlags;
 
 class UserMessagePosition
 {
diff --git a/cockatrice/src/interface/widgets/server/game_filter_configs.h b/cockatrice/src/interface/widgets/server/game_filter_configs.h
index 93ca010d8..5cb048669 100644
--- a/cockatrice/src/interface/widgets/server/game_filter_configs.h
+++ b/cockatrice/src/interface/widgets/server/game_filter_configs.h
@@ -1,11 +1,6 @@
 #ifndef COCKATRICE_GAME_FILTER_CONFIGS_H
 #define COCKATRICE_GAME_FILTER_CONFIGS_H
 
-#include <QList>
-#include <QSet>
-#include <QSharedPointer>
-#include <QString>
-#include <QStringList>
 #include <QTime>
 
 /**
@@ -17,9 +12,7 @@ struct GameFilterConfigs
     static constexpr int DEFAULT_MAX_PLAYERS_MAX = 99;
 
     bool hideBuddiesOnlyGames = false;
-    // Defaults to true to match GameFiltersSettings::isHideIgnoredUserGames(), so freshly loaded
-    // filters compare equal to a default-constructed config.
-    bool hideIgnoredUserGames = true;
+    bool hideIgnoredUserGames = false;
     bool hideFullGames = false;
     bool hideGamesThatStarted = false;
     bool hidePasswordProtectedGames = false;
diff --git a/cockatrice/src/interface/widgets/server/game_selector.cpp b/cockatrice/src/interface/widgets/server/game_selector.cpp
index 6922bfe64..659325987 100644
--- a/cockatrice/src/interface/widgets/server/game_selector.cpp
+++ b/cockatrice/src/interface/widgets/server/game_selector.cpp
@@ -1,54 +1,32 @@
 #include "game_selector.h"
 
-#include "../../../client/settings/cache_settings.h"
 #include "../../pixel_map_generator.h"
 #include "../interface/widgets/dialogs/dlg_create_game.h"
 #include "../interface/widgets/dialogs/dlg_filter_games.h"
+#include "../interface/widgets/tabs/tab_account.h"
+#include "../interface/widgets/tabs/tab_game.h"
 #include "../interface/widgets/tabs/tab_room.h"
 #include "../interface/widgets/tabs/tab_supervisor.h"
 #include "../interface/widgets/utility/get_text_with_max.h"
 #include "game_link.h"
-#include "game_selector_quick_filter_toolbar.h"
 #include "games_model.h"
-#include "libcockatrice/protocol/pb/event_add_to_list.pb.h"
-#include "libcockatrice/protocol/pb/event_remove_from_list.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_user.pb.h"
 #include "user/user_list_manager.h"
 
-#include <QAction>
 #include <QClipboard>
 #include <QDebug>
 #include <QGuiApplication>
 #include <QHBoxLayout>
 #include <QHeaderView>
-#include <QItemSelectionModel>
-#include <QLineEdit>
-#include <QMap>
-#include <QMenu>
 #include <QMessageBox>
-#include <QModelIndex>
 #include <QPushButton>
-#include <QSize>
-#include <QString>
-#include <QStringLiteral>
 #include <QTreeView>
-#include <QVBoxLayout>
-#include <QVariant>
-#include <QtGlobal>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/response.pb.h>
 #include <libcockatrice/protocol/pb/room_commands.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_game.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
+#include <libcockatrice/settings/cards_display_settings.h>
 #include <libcockatrice/settings/interface_settings.h>
-#include <qlogging.h>
-#include <qnamespace.h>
-#include <string>
-
-class QModelIndex;
-class QPoint;
-class QWidget;
-template <typename T> class QList;
 
 GameSelector::GameSelector(AbstractClient *_client,
                            TabSupervisor *_tabSupervisor,
@@ -113,17 +91,6 @@ GameSelector::GameSelector(AbstractClient *_client,
                     quickFilterToolBar->setVisible(
                         SettingsCache::instance().userInterface().getShowGameSelectorFilterToolbar());
                 });
-        // The quick-filter toolbar only updates the in-memory model, so persist every change.
-        // Otherwise each new GameSelector (room switch, reconnect, restart) would revert to stale
-        // saved values and e.g. hide full/started games the user had unchecked. The save is
-        // debounced so typing in the search field does not rewrite the settings file on every
-        // keystroke; a pending save is flushed in the destructor.
-        filterSaveDebounceTimer.setSingleShot(true);
-        filterSaveDebounceTimer.setInterval(500);
-        connect(&filterSaveDebounceTimer, &QTimer::timeout, this,
-                [this] { gameListProxyModel->saveFilterParameters(gameTypeMap); });
-        connect(gameListProxyModel, &GamesProxyModel::filtersChanged, this,
-                [this] { filterSaveDebounceTimer.start(); });
     } else {
         quickFilterToolBar = nullptr;
     }
@@ -198,18 +165,6 @@ GameSelector::GameSelector(AbstractClient *_client,
     connect(client, &AbstractClient::removeFromListEventReceived, this, &GameSelector::processRemoveFromListEvent);
 }
 
-GameSelector::~GameSelector()
-{
-    // Nothing else persists quick-filter toolbar edits: the toolbar only updates the in-memory model,
-    // and the debounced timer above is the sole writer for that path (actSetFilter/actClearFilter save
-    // synchronously, but the toolbar does not). Flush a pending debounced save so edits made within
-    // the debounce interval before destruction are not lost on room switch, reconnect, or close.
-    if (filterSaveDebounceTimer.isActive()) {
-        filterSaveDebounceTimer.stop();
-        gameListProxyModel->saveFilterParameters(gameTypeMap);
-    }
-}
-
 void GameSelector::ignoreListReceived(const QList<ServerInfo_User> &)
 {
     gameListProxyModel->refresh();
diff --git a/cockatrice/src/interface/widgets/server/game_selector.h b/cockatrice/src/interface/widgets/server/game_selector.h
index e3407abea..9af39cf50 100644
--- a/cockatrice/src/interface/widgets/server/game_selector.h
+++ b/cockatrice/src/interface/widgets/server/game_selector.h
@@ -1,35 +1,25 @@
 #ifndef GAMESELECTOR_H
 #define GAMESELECTOR_H
 
+#include "game_selector_quick_filter_toolbar.h"
 #include "game_type_map.h"
 
 #include <QGroupBox>
-#include <QTimer>
-#include <qtmetamacros.h>
-// IWYU pragma: keep
-// ServerInfo_User appears by value and inside QList in slot signatures, so the
-// moc-generated code needs the complete type.
-#include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
+#include <libcockatrice/protocol/pb/commands.pb.h>
+#include <libcockatrice/protocol/pb/event_add_to_list.pb.h>
+#include <libcockatrice/protocol/pb/event_remove_from_list.pb.h>
 
 class QTreeView;
 class GamesModel;
 class GamesProxyModel;
 class QPushButton;
+class QCheckBox;
+class QLabel;
 class AbstractClient;
 class TabSupervisor;
 class TabRoom;
 class ServerInfo_Game;
 class Response;
-class Event_AddToList;
-class Event_RemoveFromList;
-class GameSelectorQuickFilterToolBar;
-class QModelIndex;
-class QPoint;
-class QString;
-class QWidget;
-class ServerInfo_User;
-template <class Key, class T> class QMap;
-template <typename T> class QList;
 
 /**
  * @class GameSelector
@@ -149,9 +139,6 @@ private:
     const bool showFilters;  /**< Determines whether filter buttons are displayed. */
     GameTypeMap gameTypeMap; /**< Mapping of game types for the current room. */
 
-    QTimer filterSaveDebounceTimer; /**< Delays persisting quick-filter edits so typing does not rewrite the settings
-                                       file on every keystroke. */
-
     /**
      * @brief Updates the widget title to reflect the current number of displayed games.
      *
@@ -215,7 +202,6 @@ public:
                  const bool restoresettings,
                  const bool _showfilters,
                  QWidget *parent = nullptr);
-    ~GameSelector() override;
 
     /**
      * @brief Updates UI text for translation/localization.
diff --git a/cockatrice/src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp b/cockatrice/src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp
index 0fc3d879c..d668b1c33 100644
--- a/cockatrice/src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp
+++ b/cockatrice/src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp
@@ -1,22 +1,12 @@
 #include "game_selector_quick_filter_toolbar.h"
 
-#include "game_filter_configs.h"
 #include "games_model.h"
+#include "user/user_list_manager.h"
 
 #include <QCheckBox>
 #include <QComboBox>
 #include <QHBoxLayout>
 #include <QLineEdit>
-#include <QMapIterator>
-#include <QSet>
-#include <QSharedPointer>
-#include <QSignalBlocker>
-#include <QString>
-#include <QVariant>
-#include <QtGlobal>
-
-class TabSupervisor;
-template <class Key, class T> class QMap;
 
 GameSelectorQuickFilterToolBar::GameSelectorQuickFilterToolBar(QWidget *parent,
                                                                TabSupervisor *_tabSupervisor,
diff --git a/cockatrice/src/interface/widgets/server/game_selector_quick_filter_toolbar.h b/cockatrice/src/interface/widgets/server/game_selector_quick_filter_toolbar.h
index 99ed179b5..9b7b6e61f 100644
--- a/cockatrice/src/interface/widgets/server/game_selector_quick_filter_toolbar.h
+++ b/cockatrice/src/interface/widgets/server/game_selector_quick_filter_toolbar.h
@@ -1,19 +1,12 @@
 #ifndef COCKATRICE_GAME_SELECTOR_QUICK_FILTER_TOOLBAR_H
 #define COCKATRICE_GAME_SELECTOR_QUICK_FILTER_TOOLBAR_H
 
-#include <QWidget>
-#include <functional>
-#include <qtmetamacros.h>
+#include "../tabs/tab_supervisor.h"
+#include "games_model.h"
 
-class GamesProxyModel;
-class QCheckBox;
-class QComboBox;
-class QHBoxLayout;
-class QLineEdit;
-class QString;
-class TabSupervisor;
-struct GameFilterConfigs;
-template <class Key, class T> class QMap;
+#include <QHBoxLayout>
+#include <QLineEdit>
+#include <QWidget>
 
 class GameSelectorQuickFilterToolBar : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/server/games_model.cpp b/cockatrice/src/interface/widgets/server/games_model.cpp
index 315d51d9e..127badbb2 100644
--- a/cockatrice/src/interface/widgets/server/games_model.cpp
+++ b/cockatrice/src/interface/widgets/server/games_model.cpp
@@ -2,26 +2,13 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../interface/pixel_map_generator.h"
-#include "libcockatrice/protocol/pb/serverinfo_user.pb.h"
-#include "user/user_list_proxy.h"
-#include "user_level.h"
+#include "../interface/widgets/tabs/tab_account.h"
+#include "user/user_list_manager.h"
+#include "user/user_list_widget.h"
 
-#include <QAbstractItemModel>
-#include <QDate>
 #include <QDateTime>
-#include <QFlag>
 #include <QIcon>
-#include <QMapIterator>
-#include <QObject>
-#include <QSet>
-#include <QSharedPointer>
-#include <QStringList>
-#include <QTime>
 #include <QTimeZone>
-#include <QVariant>
-#include <QtGlobal>
-#include <compare>
-#include <initializer_list>
 #include <libcockatrice/protocol/pb/serverinfo_game.pb.h>
 #include <libcockatrice/settings/game_filters_settings.h>
 
@@ -523,9 +510,6 @@ bool GamesProxyModel::filterAcceptsRow(int sourceRow) const
 
 void GamesProxyModel::refresh()
 {
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 9, 0))
-    beginFilterChange();
-#endif
 #if (QT_VERSION >= QT_VERSION_CHECK(6, 10, 0))
     endFilterChange(QSortFilterProxyModel::Direction::Rows);
 #else
diff --git a/cockatrice/src/interface/widgets/server/games_model.h b/cockatrice/src/interface/widgets/server/games_model.h
index 9bf54b83a..b5f86c291 100644
--- a/cockatrice/src/interface/widgets/server/games_model.h
+++ b/cockatrice/src/interface/widgets/server/games_model.h
@@ -4,18 +4,13 @@
 #include "game_filter_configs.h"
 #include "game_type_map.h"
 
-#include <QAbstractTableModel>
 #include <QList>
-#include <QMap>
-#include <QModelIndex>
+#include <QSet>
 #include <QSortFilterProxyModel>
-#include <QString>
+#include <QTime>
 #include <libcockatrice/protocol/pb/serverinfo_game.pb.h>
-#include <qnamespace.h>
-#include <qtmetamacros.h>
 
 class UserListProxy;
-class QObject;
 
 /**
  * @class GamesModel
diff --git a/cockatrice/src/interface/widgets/server/handle_public_servers.cpp b/cockatrice/src/interface/widgets/server/handle_public_servers.cpp
index 08b7837dd..f5d682c36 100644
--- a/cockatrice/src/interface/widgets/server/handle_public_servers.cpp
+++ b/cockatrice/src/interface/widgets/server/handle_public_servers.cpp
@@ -2,19 +2,10 @@
 
 #include "../../../client/settings/cache_settings.h"
 
-#include <QByteArray>
-#include <QDebug>
 #include <QJsonDocument>
-#include <QJsonParseError>
-#include <QNetworkAccessManager>
 #include <QNetworkReply>
-#include <QNetworkRequest>
-#include <QSharedPointer>
 #include <QUrl>
-#include <QVariant>
-#include <QVariantMap>
 #include <libcockatrice/settings/servers_settings.h>
-#include <qlogging.h>
 
 #define PUBLIC_SERVERS_JSON "https://cockatrice.github.io/public-servers.json"
 
diff --git a/cockatrice/src/interface/widgets/server/handle_public_servers.h b/cockatrice/src/interface/widgets/server/handle_public_servers.h
index bacc7d3bf..fa924b183 100644
--- a/cockatrice/src/interface/widgets/server/handle_public_servers.h
+++ b/cockatrice/src/interface/widgets/server/handle_public_servers.h
@@ -9,17 +9,8 @@
 
 #include "user/user_info_connection.h"
 
-#include <QList>
-#include <QMap>
-#include <QObject>
-#include <QString>
-#include <QStringList>
-#include <qtmetamacros.h>
-#include <utility>
-
 class QNetworkReply;
 class QNetworkAccessManager;
-class QVariant;
 
 /**
  * This class is used to update the servers.ini file and ensure
diff --git a/cockatrice/src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp b/cockatrice/src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp
index 74e403ea8..df9dfbf53 100644
--- a/cockatrice/src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp
+++ b/cockatrice/src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp
@@ -1,23 +1,14 @@
 #include "remote_decklist_tree_widget.h"
 
-#include "libcockatrice/protocol/pb/response.pb.h"
-
-#include <QAbstractItemView>
 #include <QFileIconProvider>
 #include <QHeaderView>
-#include <QItemSelectionModel>
-#include <QSharedPointer>
 #include <QSortFilterProxyModel>
-#include <QVariant>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/command_deck_list.pb.h>
 #include <libcockatrice/protocol/pb/response_deck_list.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_deckstorage.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
 
-class QObject;
-class QWidget;
-
 RemoteDeckList_TreeModel::DirectoryNode::DirectoryNode(const QString &_name,
                                                        RemoteDeckList_TreeModel::DirectoryNode *_parent)
     : RemoteDeckList_TreeModel::Node(_name, _parent)
diff --git a/cockatrice/src/interface/widgets/server/remote/remote_decklist_tree_widget.h b/cockatrice/src/interface/widgets/server/remote/remote_decklist_tree_widget.h
index d553ffe9e..2cf09aff7 100644
--- a/cockatrice/src/interface/widgets/server/remote/remote_decklist_tree_widget.h
+++ b/cockatrice/src/interface/widgets/server/remote/remote_decklist_tree_widget.h
@@ -8,23 +8,13 @@
 #ifndef REMOTEDECKLIST_TREEWIDGET_H
 #define REMOTEDECKLIST_TREEWIDGET_H
 
-#include <QAbstractItemModel>
 #include <QDateTime>
-#include <QIcon>
-#include <QList>
-#include <QModelIndex>
-#include <QString>
-#include <QStringList>
 #include <QTreeView>
-#include <qnamespace.h>
-#include <qtmetamacros.h>
 
 class Response;
 class AbstractClient;
 class QSortFilterProxyModel;
 class ServerInfo_DeckStorage_TreeItem;
-class QObject;
-class QWidget;
 
 class RemoteDeckList_TreeModel : public QAbstractItemModel
 {
@@ -32,7 +22,6 @@ class RemoteDeckList_TreeModel : public QAbstractItemModel
 public:
     class DirectoryNode;
     class FileNode;
-
     class Node
     {
     protected:
diff --git a/cockatrice/src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp b/cockatrice/src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp
index c131c3cbf..d62bf81aa 100644
--- a/cockatrice/src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp
+++ b/cockatrice/src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp
@@ -1,27 +1,16 @@
 #include "remote_replay_list_tree_widget.h"
 
 #include "../../../pixel_map_generator.h"
-#include "libcockatrice/protocol/pb/response.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_replay_match.pb.h"
 
-#include <QAbstractItemView>
-#include <QDateTime>
 #include <QFileIconProvider>
 #include <QHeaderView>
-#include <QItemSelectionModel>
 #include <QSortFilterProxyModel>
-#include <QStringList>
-#include <QStringLiteral>
-#include <QVariant>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/command_replay_list.pb.h>
 #include <libcockatrice/protocol/pb/response_replay_list.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_replay.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
 
-class QObject;
-class QWidget;
-
 const int RemoteReplayList_TreeModel::numberOfColumns = 6;
 
 RemoteReplayList_TreeModel::MatchNode::MatchNode(const ServerInfo_ReplayMatch &_matchInfo)
diff --git a/cockatrice/src/interface/widgets/server/remote/remote_replay_list_tree_widget.h b/cockatrice/src/interface/widgets/server/remote/remote_replay_list_tree_widget.h
index e99702e60..10e698aee 100644
--- a/cockatrice/src/interface/widgets/server/remote/remote_replay_list_tree_widget.h
+++ b/cockatrice/src/interface/widgets/server/remote/remote_replay_list_tree_widget.h
@@ -9,30 +9,21 @@
 #ifndef REMOTEREPLAYLIST_TREEWIDGET_H
 #define REMOTEREPLAYLIST_TREEWIDGET_H
 
-#include <QAbstractItemModel>
-#include <QIcon>
-#include <QList>
-#include <QModelIndex>
-#include <QSet>
-#include <QString>
+#include <QDateTime>
 #include <QTreeView>
 #include <libcockatrice/protocol/pb/serverinfo_replay.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_replay_match.pb.h>
-#include <qnamespace.h>
-#include <qtmetamacros.h>
 
 class Response;
 class AbstractClient;
 class QSortFilterProxyModel;
-class QObject;
-class QWidget;
 
 class RemoteReplayList_TreeModel : public QAbstractItemModel
 {
     Q_OBJECT
 private:
+    class MatchNode;
     class ReplayNode;
-
     class Node
     {
     protected:
diff --git a/cockatrice/src/interface/widgets/server/user/user_avatar_provider.cpp b/cockatrice/src/interface/widgets/server/user/user_avatar_provider.cpp
index cb5f84eef..c115caa47 100644
--- a/cockatrice/src/interface/widgets/server/user/user_avatar_provider.cpp
+++ b/cockatrice/src/interface/widgets/server/user/user_avatar_provider.cpp
@@ -1,15 +1,8 @@
 #include "user_avatar_provider.h"
 
-#include "libcockatrice/protocol/pb/response.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_user.pb.h"
-#include "libcockatrice/protocol/pb/session_commands.pb.h"
-
-#include <QtGlobal>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/response_get_user_info.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
-#include <string>
-#include <sys/types.h>
 
 UserAvatarProvider::UserAvatarProvider(AbstractClient *client, QObject *parent) : QObject(parent), client(client)
 {
diff --git a/cockatrice/src/interface/widgets/server/user/user_avatar_provider.h b/cockatrice/src/interface/widgets/server/user/user_avatar_provider.h
index c1e75bc1c..44491e544 100644
--- a/cockatrice/src/interface/widgets/server/user/user_avatar_provider.h
+++ b/cockatrice/src/interface/widgets/server/user/user_avatar_provider.h
@@ -5,8 +5,6 @@
 #include <QObject>
 #include <QPixmap>
 #include <QSet>
-#include <QString>
-#include <qtmetamacros.h>
 
 class AbstractClient;
 
diff --git a/cockatrice/src/interface/widgets/server/user/user_card_art_provider.cpp b/cockatrice/src/interface/widgets/server/user/user_card_art_provider.cpp
index d84bd5804..2ba745715 100644
--- a/cockatrice/src/interface/widgets/server/user/user_card_art_provider.cpp
+++ b/cockatrice/src/interface/widgets/server/user/user_card_art_provider.cpp
@@ -2,22 +2,9 @@
 
 #include "../../../card_picture_loader/card_picture_loader.h"
 #include "../../cards/card_art_utils.h"
-#include "libcockatrice/card/card_info.h"
-#include "libcockatrice/card/database/card_database.h"
-#include "libcockatrice/card/database/card_database_loader.h"
-#include "libcockatrice/card/database/card_database_querier.h"
-#include "libcockatrice/card/printing/exact_card.h"
-#include "libcockatrice/card/printing/printing_info.h"
 
-#include <QChar>
-#include <QMetaObject>
 #include <QPointer>
-#include <QRect>
-#include <QSize>
-#include <QStringList>
 #include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/utility/card_ref.h>
-#include <memory>
 
 static QString makeKey(const QString &user, const QString &card, const QString &providerId)
 {
diff --git a/cockatrice/src/interface/widgets/server/user/user_card_art_provider.h b/cockatrice/src/interface/widgets/server/user/user_card_art_provider.h
index ce9225b00..e8283a891 100644
--- a/cockatrice/src/interface/widgets/server/user/user_card_art_provider.h
+++ b/cockatrice/src/interface/widgets/server/user/user_card_art_provider.h
@@ -1,16 +1,12 @@
 #ifndef COCKATRICE_USER_CARD_ART_PROVIDER_H
 #define COCKATRICE_USER_CARD_ART_PROVIDER_H
 
-#include <QList>
 #include <QMap>
 #include <QObject>
 #include <QPixmap>
 #include <QQueue>
 #include <QSet>
-#include <QString>
-#include <qtmetamacros.h>
-
-class ExactCard;
+#include <libcockatrice/card/printing/exact_card.h>
 
 class UserCardArtProvider : public QObject
 {
diff --git a/cockatrice/src/interface/widgets/server/user/user_card_settings_dialog.cpp b/cockatrice/src/interface/widgets/server/user/user_card_settings_dialog.cpp
index f8b57cfc2..d49e3d540 100644
--- a/cockatrice/src/interface/widgets/server/user/user_card_settings_dialog.cpp
+++ b/cockatrice/src/interface/widgets/server/user/user_card_settings_dialog.cpp
@@ -3,50 +3,30 @@
 #include "../../../card_picture_loader/card_picture_loader.h"
 #include "../../cards/art_crop_attribution.h"
 #include "../../utility/completer_utils.h"
+#include "card/card_search_model.h"
 #include "card_database_display_model.h"
 #include "card_database_model.h"
-#include "libcockatrice/card/card_info.h"
-#include "libcockatrice/card/database/card_database_querier.h"
-#include "libcockatrice/card/printing/exact_card.h"
-#include "libcockatrice/card/printing/printing_info.h"
-#include "libcockatrice/card/set/card_set.h"
 #include "user_card_art_provider.h"
 #include "user_list_painter.h"
 
-#include <QBrush>
-#include <QColor>
-#include <QComboBox>
 #include <QCompleter>
 #include <QDialogButtonBox>
 #include <QDoubleSpinBox>
-#include <QFlags>
 #include <QFormLayout>
 #include <QGroupBox>
+#include <QHBoxLayout>
 #include <QKeyEvent>
 #include <QLabel>
 #include <QLineEdit>
-#include <QLinearGradient>
-#include <QList>
 #include <QMouseEvent>
 #include <QPainter>
 #include <QPainterPath>
-#include <QPalette>
-#include <QPen>
 #include <QPushButton>
-#include <QRect>
-#include <QRectF>
-#include <QSharedPointer>
-#include <QSize>
-#include <QSizePolicy>
+#include <QRegularExpression>
 #include <QVBoxLayout>
-#include <QVariant>
 #include <QWheelEvent>
-#include <QtGlobal>
 #include <cmath>
 #include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/utility/card_ref.h>
-#include <qnamespace.h>
-#include <qnumeric.h>
 
 namespace
 {
diff --git a/cockatrice/src/interface/widgets/server/user/user_card_settings_dialog.h b/cockatrice/src/interface/widgets/server/user/user_card_settings_dialog.h
index bfba8b007..24e14dce5 100644
--- a/cockatrice/src/interface/widgets/server/user/user_card_settings_dialog.h
+++ b/cockatrice/src/interface/widgets/server/user/user_card_settings_dialog.h
@@ -3,26 +3,24 @@
 
 #include "user_list_painter.h"
 
+#include <QComboBox>
 #include <QDialog>
-#include <QMetaObject>
 #include <QPixmap>
-#include <QPoint>
-#include <QString>
-#include <QWidget>
-#include <QtGlobal>
-#include <qtmetamacros.h>
 
 class QCompleter;
+class QFocusEvent;
 class QGroupBox;
+class QKeyEvent;
+class QMouseEvent;
 class QLineEdit;
 class QDoubleSpinBox;
 class QLabel;
 class QPushButton;
+class QWheelEvent;
 class CardDatabaseModel;
 class CardDatabaseDisplayModel;
 class CardSearchModel;
 class CardCompleterProxyModel;
-class QComboBox;
 
 /**
  * @brief Interactive preview of the user list banner art.
diff --git a/cockatrice/src/interface/widgets/server/user/user_context_menu.cpp b/cockatrice/src/interface/widgets/server/user/user_context_menu.cpp
index c8fe97cda..f95ad88e4 100644
--- a/cockatrice/src/interface/widgets/server/user/user_context_menu.cpp
+++ b/cockatrice/src/interface/widgets/server/user/user_context_menu.cpp
@@ -1,42 +1,20 @@
 #include "user_context_menu.h"
 
-#include "../../../../game/abstract_game.h"
-#include "../../../../game/game_event_handler.h"
-#include "../../../../game/game_meta_info.h"
 #include "../../dialogs/dlg_report_user.h"
+#include "../../interface/widgets/tabs/tab_account.h"
+#include "../../interface/widgets/tabs/tab_game.h"
 #include "../../interface/widgets/tabs/tab_supervisor.h"
 #include "../chat_view/chat_view.h"
-#include "../game_link.h"
 #include "../game_selector.h"
-#include "../game_type_map.h"
-#include "libcockatrice/protocol/pb/admin_commands.pb.h"
-#include "libcockatrice/protocol/pb/response.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_ban.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_gametype.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_room.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_user.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_warning.pb.h"
 #include "user_info_box.h"
-#include "user_level.h"
 #include "user_list_dialog.h"
 #include "user_list_manager.h"
 #include "user_list_proxy.h"
 
 #include <QAction>
-#include <QClipboard>
-#include <QCursor>
-#include <QDialog>
-#include <QFlags>
-#include <QGuiApplication>
-#include <QHeaderView>
-#include <QMap>
 #include <QMenu>
-#include <QMessageBox>
-#include <QSharedPointer>
-#include <QSizePolicy>
-#include <QTableWidget>
-#include <QTableWidgetItem>
-#include <QWidget>
+#include <QtGui>
+#include <QtWidgets>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/command_kick_from_game.pb.h>
 #include <libcockatrice/protocol/pb/commands.pb.h>
@@ -49,10 +27,6 @@
 #include <libcockatrice/protocol/pb/response_warn_list.pb.h>
 #include <libcockatrice/protocol/pb/session_commands.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
-#include <qnamespace.h>
-#include <string>
-
-class QVariant;
 
 UserContextMenu::UserContextMenu(TabSupervisor *_tabSupervisor, QWidget *parent, AbstractGame *_game)
     : QObject(parent), client(_tabSupervisor->getClient()), tabSupervisor(_tabSupervisor),
diff --git a/cockatrice/src/interface/widgets/server/user/user_context_menu.h b/cockatrice/src/interface/widgets/server/user/user_context_menu.h
index 2536819a4..0922eae94 100644
--- a/cockatrice/src/interface/widgets/server/user/user_context_menu.h
+++ b/cockatrice/src/interface/widgets/server/user/user_context_menu.h
@@ -11,22 +11,19 @@
 
 #include <QList>
 #include <QObject>
-#include <QString>
 #include <functional>
 #include <libcockatrice/network/server/remote/user_level.h>
-#include <qtmetamacros.h>
-#include <utility>
-
 class AbstractGame;
 class UserListProxy;
 class AbstractClient;
 class ChatView;
 class CommandContainer;
 class QAction;
+class QMenu;
 class QPoint;
 class Response;
+class ServerInfo_User;
 class TabSupervisor;
-class QWidget;
 
 class UserContextMenu : public QObject
 {
diff --git a/cockatrice/src/interface/widgets/server/user/user_info_box.cpp b/cockatrice/src/interface/widgets/server/user/user_info_box.cpp
index ff3d9a224..3d89cecf5 100644
--- a/cockatrice/src/interface/widgets/server/user/user_info_box.cpp
+++ b/cockatrice/src/interface/widgets/server/user/user_info_box.cpp
@@ -5,36 +5,20 @@
 #include "../../interface/widgets/dialogs/dlg_edit_password.h"
 #include "../../interface/widgets/dialogs/dlg_edit_user.h"
 #include "../../interface/widgets/utility/get_text_with_max.h"
-#include "libcockatrice/protocol/pb/response.pb.h"
-#include "libcockatrice/utility/days_years_between.h"
 #include "user_card_settings_dialog.h"
-#include "user_level.h"
-#include "user_list_painter.h"
 
-#include <QByteArray>
-#include <QDate>
 #include <QDateTime>
-#include <QDialog>
-#include <QFlag>
-#include <QFont>
 #include <QGridLayout>
 #include <QHBoxLayout>
+#include <QInputDialog>
 #include <QLabel>
-#include <QLineEdit>
-#include <QLocale>
 #include <QMessageBox>
-#include <QSharedPointer>
-#include <QSize>
-#include <QSizePolicy>
-#include <QtGlobal>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/response_get_user_info.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
 #include <libcockatrice/protocol/pb/session_commands.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
 #include <libcockatrice/utility/passwordhasher.h>
-#include <string>
-#include <sys/types.h>
 
 UserInfoBox::UserInfoBox(AbstractClient *_client, bool _editable, QWidget *parent, Qt::WindowFlags flags)
     : QWidget(parent, flags), client(_client), editable(_editable)
diff --git a/cockatrice/src/interface/widgets/server/user/user_info_box.h b/cockatrice/src/interface/widgets/server/user/user_info_box.h
index 6bc571a37..955cb9d3d 100644
--- a/cockatrice/src/interface/widgets/server/user/user_info_box.h
+++ b/cockatrice/src/interface/widgets/server/user/user_info_box.h
@@ -7,15 +7,13 @@
 #ifndef USERINFOBOX_H
 #define USERINFOBOX_H
 
+#include <QDateTime>
 #include <QLabel>
-#include <QPixmap>
 #include <QPushButton>
-#include <QString>
 #include <QWidget>
 #include <libcockatrice/network/server/remote/user_level.h>
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
-#include <qnamespace.h>
-#include <qtmetamacros.h>
+#include <libcockatrice/utility/days_years_between.h>
 
 class AbstractClient;
 class Response;
diff --git a/cockatrice/src/interface/widgets/server/user/user_info_connection.cpp b/cockatrice/src/interface/widgets/server/user/user_info_connection.cpp
index d23ac63ba..f934960f8 100644
--- a/cockatrice/src/interface/widgets/server/user/user_info_connection.cpp
+++ b/cockatrice/src/interface/widgets/server/user/user_info_connection.cpp
@@ -2,10 +2,7 @@
 
 #include "../../../../client/settings/cache_settings.h"
 
-#include <QList>
-#include <QMessageLogger>
-#include <QSharedPointer>
-#include <QVariant>
+#include <QDebug>
 #include <libcockatrice/settings/servers_settings.h>
 #include <utility>
 
diff --git a/cockatrice/src/interface/widgets/server/user/user_info_connection.h b/cockatrice/src/interface/widgets/server/user/user_info_connection.h
index b44d97d42..6278815a9 100644
--- a/cockatrice/src/interface/widgets/server/user/user_info_connection.h
+++ b/cockatrice/src/interface/widgets/server/user/user_info_connection.h
@@ -7,11 +7,12 @@
 #ifndef USERCONNECTION_INFORMATION_H
 #define USERCONNECTION_INFORMATION_H
 
+#include <QApplication>
+#include <QDir>
+#include <QFile>
 #include <QLoggingCategory>
-#include <QMap>
-#include <QString>
-#include <QStringList>
-#include <utility>
+#include <QSettings>
+#include <QStandardPaths>
 
 inline Q_LOGGING_CATEGORY(UserInfoConnectionLog, "user_info_connection");
 
diff --git a/cockatrice/src/interface/widgets/server/user/user_info_popup.cpp b/cockatrice/src/interface/widgets/server/user/user_info_popup.cpp
index c3e880084..967de2f2c 100644
--- a/cockatrice/src/interface/widgets/server/user/user_info_popup.cpp
+++ b/cockatrice/src/interface/widgets/server/user/user_info_popup.cpp
@@ -4,61 +4,26 @@
 #include "../../interface/pixel_map_generator.h"
 #include "../../interface/theme_manager.h"
 #include "../../interface/widgets/tabs/tab_supervisor.h"
-#include "libcockatrice/card/database/card_database_querier.h"
-#include "libcockatrice/card/printing/exact_card.h"
-#include "libcockatrice/protocol/pb/response.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_game.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_user.pb.h"
-#include "libcockatrice/protocol/pb/session_commands.pb.h"
-#include "user_level.h"
 #include "user_list_painter.h"
 
 #include <QApplication>
-#include <QBrush>
-#include <QChar>
-#include <QFlag>
-#include <QFlags>
-#include <QFont>
-#include <QFontMetrics>
 #include <QGridLayout>
 #include <QHBoxLayout>
-#include <QImage>
 #include <QLabel>
-#include <QLayout>
-#include <QLinearGradient>
-#include <QList>
-#include <QListView>
-#include <QMap>
-#include <QMenu>
-#include <QModelIndex>
 #include <QPainter>
 #include <QPainterPath>
-#include <QPen>
-#include <QPoint>
+#include <QPropertyAnimation>
 #include <QPushButton>
-#include <QRect>
-#include <QRectF>
-#include <QSharedPointer>
-#include <QSize>
-#include <QSizePolicy>
+#include <QScreen>
+#include <QScrollBar>
 #include <QStandardItem>
-#include <QStandardItemModel>
-#include <QStringLiteral>
-#include <QStyle>
-#include <QStyleOptionViewItem>
 #include <QStyledItemDelegate>
 #include <QVBoxLayout>
-#include <QVariant>
-#include <QtGlobal>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
+#include <libcockatrice/protocol/pb/commands.pb.h>
 #include <libcockatrice/protocol/pb/response_get_games_of_user.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
-#include <libcockatrice/utility/card_ref.h>
-#include <qnumeric.h>
-#include <string>
-
-class QAction;
 
 /// Qt stylesheets accept #aarrggbb, which is QColor::name(QColor::HexArgb).
 static QString colorStr(const QColor &color)
diff --git a/cockatrice/src/interface/widgets/server/user/user_info_popup.h b/cockatrice/src/interface/widgets/server/user/user_info_popup.h
index f2a91d025..ed7320fba 100644
--- a/cockatrice/src/interface/widgets/server/user/user_info_popup.h
+++ b/cockatrice/src/interface/widgets/server/user/user_info_popup.h
@@ -1,29 +1,24 @@
 #ifndef COCKATRICE_USER_INFO_POPUP_H
 #define COCKATRICE_USER_INFO_POPUP_H
 
+#include "../../interface/widgets/server/game_type_map.h"
 #include "user_list_painter.h"
 
-#include <QColor>
 #include <QFrame>
-#include <QPalette>
+#include <QListView>
+#include <QMap>
 #include <QPixmap>
-#include <QString>
-#include <QWidget>
+#include <QStandardItemModel>
 #include <functional>
+#include <libcockatrice/network/server/remote/user_level.h>
+#include <libcockatrice/protocol/pb/response.pb.h>
+#include <libcockatrice/protocol/pb/serverinfo_game.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
-#include <qnamespace.h>
-#include <qtmetamacros.h>
-#include <utility>
 
 class AbstractClient;
 class QLabel;
 class QPushButton;
 class TabSupervisor;
-class QListView;
-class QPoint;
-class QStandardItemModel;
-class Response;
-template <class Key, class T> class QMap;
 
 // ── Roles ─────────────────────────────────────────────────────────────────────
 
diff --git a/cockatrice/src/interface/widgets/server/user/user_list_dialog.cpp b/cockatrice/src/interface/widgets/server/user/user_list_dialog.cpp
index 605c89734..fc5b520ad 100644
--- a/cockatrice/src/interface/widgets/server/user/user_list_dialog.cpp
+++ b/cockatrice/src/interface/widgets/server/user/user_list_dialog.cpp
@@ -1,26 +1,17 @@
 #include "user_list_dialog.h"
 
-#include "libcockatrice/protocol/pb/serverinfo_user.pb.h"
-
 #include <QCheckBox>
 #include <QComboBox>
-#include <QGridLayout>
 #include <QGroupBox>
-#include <QHBoxLayout>
 #include <QLabel>
 #include <QLineEdit>
 #include <QMessageBox>
 #include <QPlainTextEdit>
 #include <QPushButton>
 #include <QRadioButton>
-#include <QSharedPointer>
 #include <QSpinBox>
 #include <QVBoxLayout>
-#include <QVariant>
 #include <libcockatrice/utility/string_limits.h>
-#include <qnamespace.h>
-
-class QWidget;
 
 BanDialog::BanDialog(const ServerInfo_User &info, QWidget *parent) : QDialog(parent)
 {
diff --git a/cockatrice/src/interface/widgets/server/user/user_list_dialog.h b/cockatrice/src/interface/widgets/server/user/user_list_dialog.h
index e10fca5bb..fa7d5de92 100644
--- a/cockatrice/src/interface/widgets/server/user/user_list_dialog.h
+++ b/cockatrice/src/interface/widgets/server/user/user_list_dialog.h
@@ -2,8 +2,7 @@
 #define COCKATRICE_USER_LIST_DIALOG_H
 
 #include <QDialog>
-#include <QString>
-#include <qtmetamacros.h>
+#include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
 
 class QComboBox;
 class QLabel;
@@ -12,8 +11,6 @@ class QRadioButton;
 class QSpinBox;
 class QLineEdit;
 class QCheckBox;
-class QWidget;
-class ServerInfo_User;
 
 class BanDialog : public QDialog
 {
diff --git a/cockatrice/src/interface/widgets/server/user/user_list_manager.cpp b/cockatrice/src/interface/widgets/server/user/user_list_manager.cpp
index 385a969fd..216420006 100644
--- a/cockatrice/src/interface/widgets/server/user/user_list_manager.cpp
+++ b/cockatrice/src/interface/widgets/server/user/user_list_manager.cpp
@@ -1,11 +1,8 @@
 #include "user_list_manager.h"
 
-#include "libcockatrice/protocol/pb/response.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_user.pb.h"
+#include "../../client/sound_engine.h"
+#include "user_info_box.h"
 
-#include <QList>
-#include <QSharedPointer>
-#include <algorithm>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/event_add_to_list.pb.h>
 #include <libcockatrice/protocol/pb/event_remove_from_list.pb.h>
diff --git a/cockatrice/src/interface/widgets/server/user/user_list_manager.h b/cockatrice/src/interface/widgets/server/user/user_list_manager.h
index b2ff69286..6238f0799 100644
--- a/cockatrice/src/interface/widgets/server/user/user_list_manager.h
+++ b/cockatrice/src/interface/widgets/server/user/user_list_manager.h
@@ -10,22 +10,18 @@
 #include "user_list_proxy.h"
 
 #include <QMap>
-#include <QObject>
-#include <QString>
-#include <qtmetamacros.h>
-// IWYU pragma: keep
-// ServerInfo_User appears by value and inside QList in slot signatures, so the
-// moc-generated code needs the complete type.
+#include <QWidget>
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
 
 class AbstractClient;
 class Event_AddToList;
+class Event_ListRooms;
 class Event_RemoveFromList;
 class Event_UserJoined;
 class Event_UserLeft;
 class Response;
 class ServerInfo_User;
-template <typename T> class QList;
+class TabSupervisor;
 
 class UserListManager : public QObject, public UserListProxy
 {
diff --git a/cockatrice/src/interface/widgets/server/user/user_list_painter.cpp b/cockatrice/src/interface/widgets/server/user/user_list_painter.cpp
index 08eaaaff7..34a3d6ae1 100644
--- a/cockatrice/src/interface/widgets/server/user/user_list_painter.cpp
+++ b/cockatrice/src/interface/widgets/server/user/user_list_painter.cpp
@@ -1,35 +1,14 @@
 #include "user_list_painter.h"
 
 #include "../../interface/pixel_map_generator.h"
-#include "libcockatrice/protocol/pb/serverinfo_user.pb.h"
 
 #include <QAbstractScrollArea>
 #include <QApplication>
-#include <QBrush>
-#include <QChar>
-#include <QFlag>
-#include <QFlags>
-#include <QFont>
-#include <QFontMetrics>
-#include <QImage>
-#include <QLinearGradient>
-#include <QMap>
-#include <QModelIndex>
-#include <QObject>
 #include <QPainter>
 #include <QPainterPath>
-#include <QPen>
-#include <QPixmap>
-#include <QPoint>
 #include <QScrollBar>
-#include <QSharedPointer>
 #include <QStyle>
 #include <QStyleOptionViewItem>
-#include <QVariant>
-#include <QWidget>
-#include <QtGlobal>
-#include <qnamespace.h>
-#include <qnumeric.h>
 
 static constexpr int RowHeight = 72;
 static constexpr int AvatarSize = 36;
diff --git a/cockatrice/src/interface/widgets/server/user/user_list_painter.h b/cockatrice/src/interface/widgets/server/user/user_list_painter.h
index e7293a097..352a01f6b 100644
--- a/cockatrice/src/interface/widgets/server/user/user_list_painter.h
+++ b/cockatrice/src/interface/widgets/server/user/user_list_painter.h
@@ -5,19 +5,16 @@
 
 #include <QColor>
 #include <QList>
+#include <QMap>
 #include <QPalette>
+#include <QPixmap>
 #include <QRect>
-#include <QRectF>
 #include <QSize>
-#include <QString>
-#include <QtGlobal>
 
 class QPainter;
 class QModelIndex;
 class QStyleOptionViewItem;
 class ServerInfo_User;
-class QPixmap;
-template <class Key, class T> class QMap;
 
 struct CardArtParams
 {
diff --git a/cockatrice/src/interface/widgets/server/user/user_list_panel_widget.cpp b/cockatrice/src/interface/widgets/server/user/user_list_panel_widget.cpp
index 78d45d120..937058024 100644
--- a/cockatrice/src/interface/widgets/server/user/user_list_panel_widget.cpp
+++ b/cockatrice/src/interface/widgets/server/user/user_list_panel_widget.cpp
@@ -1,13 +1,12 @@
 #include "user_list_panel_widget.h"
 
 #include "../../../../client/settings/cache_settings.h"
+#include "user_list_manager.h"
 #include "user_list_widget.h"
 
 #include <QLineEdit>
-#include <QList>
-#include <QStringList>
-#include <QStringLiteral>
 #include <QVBoxLayout>
+#include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/settings/interface_settings.h>
 
 namespace
diff --git a/cockatrice/src/interface/widgets/server/user/user_list_panel_widget.h b/cockatrice/src/interface/widgets/server/user/user_list_panel_widget.h
index 088365bbc..7ae14dfcf 100644
--- a/cockatrice/src/interface/widgets/server/user/user_list_panel_widget.h
+++ b/cockatrice/src/interface/widgets/server/user/user_list_panel_widget.h
@@ -8,9 +8,7 @@
 
 #include "user_list_widget.h"
 
-#include <QString>
 #include <QWidget>
-#include <qtmetamacros.h>
 
 class AbstractClient;
 class QLineEdit;
diff --git a/cockatrice/src/interface/widgets/server/user/user_list_widget.cpp b/cockatrice/src/interface/widgets/server/user/user_list_widget.cpp
index b3fd1d1a9..3b8fc08b7 100644
--- a/cockatrice/src/interface/widgets/server/user/user_list_widget.cpp
+++ b/cockatrice/src/interface/widgets/server/user/user_list_widget.cpp
@@ -4,64 +4,18 @@
 #include "../../interface/pixel_map_generator.h"
 #include "../../interface/theme_manager.h"
 #include "../../interface/widgets/tabs/tab_supervisor.h"
-#include "user_avatar_provider.h"
-#include "user_card_art_provider.h"
 #include "user_context_menu.h"
-#include "user_info_popup.h"
-#include "user_level.h"
-#include "user_list_manager.h"
 #include "user_list_painter.h"
-#include "user_list_proxy.h"
 
-#include <QAbstractAnimation>
-#include <QAbstractItemModel>
-#include <QApplication>
-#include <QByteArray>
-#include <QColor>
-#include <QContextMenuEvent>
-#include <QCursor>
 #include <QEvent>
-#include <QFlag>
-#include <QFlags>
-#include <QFont>
-#include <QFontMetrics>
-#include <QFrame>
-#include <QGuiApplication>
 #include <QHeaderView>
-#include <QIcon>
-#include <QItemSelection>
-#include <QItemSelectionModel>
-#include <QKeyEvent>
-#include <QLayout>
 #include <QMenu>
-#include <QModelIndex>
 #include <QMouseEvent>
-#include <QObject>
 #include <QPainter>
-#include <QPalette>
-#include <QPoint>
-#include <QPointF>
-#include <QPropertyAnimation>
-#include <QRect>
-#include <QScreen>
 #include <QScrollBar>
-#include <QSharedPointer>
-#include <QSignalBlocker>
-#include <QSize>
-#include <QStringLiteral>
-#include <QStyle>
-#include <QStyleOptionViewItem>
 #include <QTimer>
-#include <QTreeWidget>
 #include <QVBoxLayout>
-#include <QVariant>
-#include <QWidget>
-#include <QtGlobal>
 #include <libcockatrice/settings/appearance_settings.h>
-#include <qnamespace.h>
-
-class QPixmap;
-struct GameInviteOption;
 
 namespace UserListRoles
 {
diff --git a/cockatrice/src/interface/widgets/server/user/user_list_widget.h b/cockatrice/src/interface/widgets/server/user/user_list_widget.h
index 8093222ea..9802387b2 100644
--- a/cockatrice/src/interface/widgets/server/user/user_list_widget.h
+++ b/cockatrice/src/interface/widgets/server/user/user_list_widget.h
@@ -7,34 +7,33 @@
 #ifndef USERLIST_H
 #define USERLIST_H
 
-#include "libcockatrice/protocol/pb/serverinfo_user.pb.h"
+#include "../../cards/card_info_picture_art_crop_widget.h"
+#include "../../interface/widgets/server/game_link.h"
+#include "user_avatar_provider.h"
+#include "user_card_art_provider.h"
+#include "user_info_popup.h"
+#include "user_list_manager.h"
+#include "user_list_painter.h"
 
+#include <QComboBox>
 #include <QGroupBox>
-#include <QList>
-#include <QMap>
 #include <QSet>
-#include <QString>
 #include <QStyledItemDelegate>
+#include <QTextEdit>
 #include <QTreeWidgetItem>
 #include <functional>
-#include <qtmetamacros.h>
-#include <utility>
+#include <libcockatrice/network/server/remote/user_level.h>
+#include <libcockatrice/protocol/pb/moderator_commands.pb.h>
 
+class QTreeWidget;
+class ServerInfo_User;
 class AbstractClient;
 class TabSupervisor;
+class Response;
+class CommandContainer;
 class UserContextMenu;
 class UserListWidget;
-class QModelIndex;
-class QPixmap;
-class QPoint;
-class QTimer;
-class QWidget;
-class UserAvatarProvider;
-class UserCardArtProvider;
-class UserInfoPopup;
-class UserListManager;
-struct CardArtParams;
-struct GameInviteOption;
+class QShowEvent;
 
 class UserListItemDelegate : public QStyledItemDelegate
 {
diff --git a/cockatrice/src/interface/widgets/settings_page/abstract_settings_page.cpp b/cockatrice/src/interface/widgets/settings_page/abstract_settings_page.cpp
index 9c43d1f7b..9a70e94c5 100644
--- a/cockatrice/src/interface/widgets/settings_page/abstract_settings_page.cpp
+++ b/cockatrice/src/interface/widgets/settings_page/abstract_settings_page.cpp
@@ -2,22 +2,14 @@
 
 #include "settings_search_model.h"
 
-#include <QChar>
 #include <QCheckBox>
 #include <QGridLayout>
 #include <QGroupBox>
 #include <QLabel>
-#include <QLatin1Char>
 #include <QLayout>
-#include <QLayoutItem>
 #include <QLineEdit>
-#include <QObject>
 #include <QPair>
 #include <QSpinBox>
-#include <QString>
-#include <QStringList>
-#include <QTextDocument>
-#include <utility>
 
 /**
  * @brief Recursively collects all widgets within a layout
diff --git a/cockatrice/src/interface/widgets/settings_page/abstract_settings_page.h b/cockatrice/src/interface/widgets/settings_page/abstract_settings_page.h
index 722a91e62..3140f94f3 100644
--- a/cockatrice/src/interface/widgets/settings_page/abstract_settings_page.h
+++ b/cockatrice/src/interface/widgets/settings_page/abstract_settings_page.h
@@ -3,7 +3,6 @@
 
 #include <QList>
 #include <QWidget>
-#include <qtmetamacros.h>
 
 #define WIKI_CUSTOM_PIC_URL "https://github.com/Cockatrice/Cockatrice/wiki/Custom-Picture-Download-URLs"
 #define WIKI_CUSTOM_SHORTCUTS "https://github.com/Cockatrice/Cockatrice/wiki/Custom-Keyboard-Shortcuts"
diff --git a/cockatrice/src/interface/widgets/settings_page/appearance_settings_page.cpp b/cockatrice/src/interface/widgets/settings_page/appearance_settings_page.cpp
index 4c38459c6..415eef6b9 100644
--- a/cockatrice/src/interface/widgets/settings_page/appearance_settings_page.cpp
+++ b/cockatrice/src/interface/widgets/settings_page/appearance_settings_page.cpp
@@ -1,44 +1,29 @@
 #include "appearance_settings_page.h"
 
 #include "../../../client/settings/cache_settings.h"
+#include "../../../client/settings/card_counter_settings.h"
 #include "../../client/settings/card_counter_settings.h"
 #include "../../palette_editor/palette_editor_dialog.h"
-#include "../../theme_config.h"
 #include "../dialogs/override_printing_warning.h"
 #include "../general/home_tab_button_color.h"
 #include "../interface/theme_manager.h"
 #include "../interface/widgets/general/background_sources.h"
 #include "../playmat/playmat_collection_dialog.h"
-#include "libcockatrice/interfaces/interface_interface_settings_provider.h"
-#include "libcockatrice/utility/macros.h"
+#include "../playmat/playmat_settings_dialog.h"
 
-#include <QAbstractButton>
 #include <QApplication>
-#include <QColor>
 #include <QColorDialog>
-#include <QDebug>
 #include <QDesktopServices>
-#include <QDir>
 #include <QGridLayout>
-#include <QGroupBox>
+#include <QHBoxLayout>
 #include <QMessageBox>
-#include <QObject>
-#include <QSharedPointer>
-#include <QString>
-#include <QStringList>
-#include <QStringLiteral>
 #include <QStyleFactory>
 #include <QTimer>
-#include <QUrl>
-#include <QVBoxLayout>
-#include <QVariant>
-#include <QtGlobal>
 #include <libcockatrice/settings/appearance_settings.h>
 #include <libcockatrice/settings/cards_display_settings.h>
 #include <libcockatrice/settings/interface_settings.h>
 #include <libcockatrice/settings/paths_settings.h>
 #include <libcockatrice/settings/personal_settings.h>
-#include <qnamespace.h>
 
 AppearanceSettingsPage::AppearanceSettingsPage()
 {
@@ -74,10 +59,15 @@ AppearanceSettingsPage::AppearanceSettingsPage()
     connect(&schemeCombo, &QComboBox::currentIndexChanged, this,
             [this] { themeManager->setColorScheme(schemeCombo.currentData().toString()); });
 
-    // Qt widget style; "System" lets the application decide. The broken Windows
-    // native styles are still offered, but selecting one raises a warning.
+    // Qt widget style; "System" lets the application decide
     styleCombo.addItem(tr("System"), QStringLiteral("System"));
     for (const QString &key : QStyleFactory::keys()) {
+        // The Windows 11 native style is broken (board rendering glitches when
+        // moving cards), so never offer it; it is already sanitized at apply
+        // time in ThemeManager.
+        if (key.compare("windows11", Qt::CaseInsensitive) == 0) {
+            continue;
+        }
         styleCombo.addItem(key, key);
     }
 
@@ -87,7 +77,6 @@ AppearanceSettingsPage::AppearanceSettingsPage()
 
     connect(&styleCombo, &QComboBox::currentIndexChanged, this,
             [this] { themeManager->setStyleName(styleCombo.currentData().toString()); });
-    connect(&styleCombo, &QComboBox::currentIndexChanged, this, &AppearanceSettingsPage::updateStyleWarning);
 
     connect(themeManager, &ThemeManager::themeChanged, this, [this, dirPath] {
         const QString newDir = themeManager->getAvailableThemes().value(SettingsCache::instance().getThemeName());
@@ -104,8 +93,6 @@ AppearanceSettingsPage::AppearanceSettingsPage()
         const int styleIdx = currentStyle.isEmpty() ? 0 : styleCombo.findData(currentStyle);
         styleCombo.setCurrentIndex(styleIdx >= 0 ? styleIdx : 0);
         styleCombo.blockSignals(false);
-
-        updateStyleWarning();
     });
 
     connect(&editPaletteButton, &QPushButton::clicked, this, &AppearanceSettingsPage::editPalette);
@@ -118,11 +105,7 @@ AppearanceSettingsPage::AppearanceSettingsPage()
     themeGrid->addWidget(&schemeCombo, 2, 1);
     themeGrid->addWidget(&styleComboLabel, 3, 0);
     themeGrid->addWidget(&styleCombo, 3, 1);
-    themeGrid->addWidget(&styleWarningLabel, 4, 0, 1, 2);
-    themeGrid->addWidget(&editPaletteButton, 5, 1);
-
-    styleWarningLabel.setWordWrap(true);
-    styleWarningLabel.setAlignment(Qt::AlignLeft | Qt::AlignVCenter);
+    themeGrid->addWidget(&editPaletteButton, 4, 1);
 
     themeGroupBox = new QGroupBox;
     themeGroupBox->setLayout(themeGrid);
@@ -467,14 +450,6 @@ void AppearanceSettingsPage::updateHomeTabSettingsVisibility()
     homeTabDisplayCardNameCheckBox.setVisible(visible);
 }
 
-void AppearanceSettingsPage::updateStyleWarning()
-{
-    const QString style = styleCombo.currentData().toString();
-    const bool broken =
-        style.compare("windows11", Qt::CaseInsensitive) == 0 || style.compare("windowsvista", Qt::CaseInsensitive) == 0;
-    styleWarningLabel.setVisible(broken);
-}
-
 void AppearanceSettingsPage::showShortcutsChanged(QT_STATE_CHANGED_T value)
 {
     SettingsCache::instance().userInterface().setShowShortcuts(value);
@@ -537,11 +512,6 @@ void AppearanceSettingsPage::retranslateUi()
     schemeComboLabel.setText(tr("Active theme palette:"));
     styleComboLabel.setText(tr("Active theme style:"));
     styleCombo.setToolTip(tr("Qt widget style saved to this theme (\"System\" lets the application decide)"));
-    styleWarningLabel.setText(
-        tr("Warning: the Windows 11 and Windows Vista styles are buggy and can render controls such as combo boxes "
-           "unreadable, especially in dark mode. Fusion is the recommended style on every platform: it is Qt's "
-           "cross-platform style and the one Cockatrice is developed against."));
-    updateStyleWarning();
     editPaletteButton.setText(tr("Edit theme palette"));
 
     homeTabGroupBox->setTitle(tr("Home tab settings"));
diff --git a/cockatrice/src/interface/widgets/settings_page/appearance_settings_page.h b/cockatrice/src/interface/widgets/settings_page/appearance_settings_page.h
index 8afd326a3..bec4cd72f 100644
--- a/cockatrice/src/interface/widgets/settings_page/appearance_settings_page.h
+++ b/cockatrice/src/interface/widgets/settings_page/appearance_settings_page.h
@@ -5,14 +5,11 @@
 
 #include <QCheckBox>
 #include <QComboBox>
+#include <QGroupBox>
 #include <QLabel>
-#include <QList>
 #include <QPushButton>
 #include <QSpinBox>
 #include <libcockatrice/utility/macros.h>
-#include <qtmetamacros.h>
-
-class QGroupBox;
 
 class AppearanceSettingsPage : public AbstractSettingsPage
 {
@@ -22,7 +19,6 @@ private slots:
     void openThemeLocation();
     void editPalette();
     void updateHomeTabSettingsVisibility();
-    void updateStyleWarning();
     void showShortcutsChanged(QT_STATE_CHANGED_T enabled);
     void overrideAllCardArtWithPersonalPreferenceToggled(QT_STATE_CHANGED_T enabled);
 
@@ -38,7 +34,6 @@ private:
     QComboBox schemeCombo;
     QLabel styleComboLabel;
     QComboBox styleCombo;
-    QLabel styleWarningLabel;
     QPushButton editPaletteButton;
 
     QLabel homeTabBackgroundSourceLabel;
diff --git a/cockatrice/src/interface/widgets/settings_page/deck_editor_settings_page.cpp b/cockatrice/src/interface/widgets/settings_page/deck_editor_settings_page.cpp
index 31178ba4c..bdbb38c95 100644
--- a/cockatrice/src/interface/widgets/settings_page/deck_editor_settings_page.cpp
+++ b/cockatrice/src/interface/widgets/settings_page/deck_editor_settings_page.cpp
@@ -2,42 +2,21 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../pixel_map_generator.h"
-#include "../dialogs/path_safety_warning.h"
 #include "update/card_spoiler/spoiler_background_updater.h"
 
-#include <QAbstractItemModel>
-#include <QAbstractItemView>
-#include <QAction>
-#include <QDateTime>
-#include <QDebug>
-#include <QDir>
-#include <QFile>
 #include <QFileDialog>
 #include <QFileInfo>
-#include <QGridLayout>
-#include <QGroupBox>
 #include <QHBoxLayout>
-#include <QHash>
 #include <QInputDialog>
 #include <QLineEdit>
-#include <QList>
-#include <QListWidget>
-#include <QListWidgetItem>
 #include <QMessageBox>
 #include <QSet>
-#include <QSizePolicy>
-#include <QStringList>
-#include <QStringLiteral>
 #include <QToolBar>
 #include <QUrl>
-#include <QVBoxLayout>
-#include <QVariant>
 #include <libcockatrice/settings/download_settings.h>
 #include <libcockatrice/settings/paths_settings.h>
 #include <libcockatrice/settings/personal_settings.h>
 #include <libcockatrice/utility/macros.h>
-#include <qlogging.h>
-#include <qnamespace.h>
 
 DeckEditorSettingsPage::DeckEditorSettingsPage()
 {
@@ -364,9 +343,6 @@ void DeckEditorSettingsPage::spoilerPathButtonClicked()
     if (lsPath.isEmpty()) {
         return;
     }
-    if (!PathSafetyWarning::confirmOutsideProgramDir(this, lsPath + "/spoiler.xml")) {
-        return;
-    }
 
     mpSpoilerSavePathLineEdit->setText(lsPath + "/spoiler.xml");
     SettingsCache::instance().paths().setSpoilerDatabasePath(lsPath + "/spoiler.xml");
diff --git a/cockatrice/src/interface/widgets/settings_page/deck_editor_settings_page.h b/cockatrice/src/interface/widgets/settings_page/deck_editor_settings_page.h
index 47f840191..23e33fa20 100644
--- a/cockatrice/src/interface/widgets/settings_page/deck_editor_settings_page.h
+++ b/cockatrice/src/interface/widgets/settings_page/deck_editor_settings_page.h
@@ -4,17 +4,10 @@
 #include "abstract_settings_page.h"
 
 #include <QCheckBox>
+#include <QGroupBox>
 #include <QLabel>
+#include <QListWidget>
 #include <QPushButton>
-#include <QString>
-#include <qtmetamacros.h>
-
-class QAction;
-class QGroupBox;
-class QLineEdit;
-class QListWidget;
-class QListWidgetItem;
-class QModelIndex;
 
 class DeckEditorSettingsPage : public AbstractSettingsPage
 {
diff --git a/cockatrice/src/interface/widgets/settings_page/general_settings_page.cpp b/cockatrice/src/interface/widgets/settings_page/general_settings_page.cpp
index fa8938b32..57099fb4a 100644
--- a/cockatrice/src/interface/widgets/settings_page/general_settings_page.cpp
+++ b/cockatrice/src/interface/widgets/settings_page/general_settings_page.cpp
@@ -1,32 +1,18 @@
 #include "general_settings_page.h"
 
 #include "../../../client/settings/cache_settings.h"
-#include "../dialogs/path_safety_warning.h"
 #include "../interface/card_picture_loader/card_picture_loader.h"
 #include "../main.h"
 #include "../server/user/user_info_connection.h"
 #include "update/client/release_channel.h"
 
-#include <QByteArray>
 #include <QCoreApplication>
-#include <QDate>
-#include <QDebug>
 #include <QFile>
 #include <QFileDialog>
 #include <QGridLayout>
-#include <QGroupBox>
 #include <QLineEdit>
-#include <QList>
-#include <QMap>
 #include <QMessageBox>
-#include <QPushButton>
-#include <QSharedPointer>
-#include <QSizePolicy>
 #include <QTranslator>
-#include <QVBoxLayout>
-#include <QVariant>
-#include <QVariantList>
-#include <QtGlobal>
 #include <libcockatrice/card/card_localization.h>
 #include <libcockatrice/settings/cards_display_settings.h>
 #include <libcockatrice/settings/download_settings.h>
@@ -36,9 +22,6 @@
 #include <libcockatrice/settings/updates_settings.h>
 #include <libcockatrice/utility/macros.h>
 #include <libcockatrice/utility/translation_loader.h>
-#include <qlogging.h>
-#include <qnamespace.h>
-#include <utility>
 
 enum startupCardUpdateCheckBehaviorIndex
 {
@@ -162,18 +145,12 @@ GeneralSettingsPage::GeneralSettingsPage()
 
     newVersionOracleCheckBox.setChecked(settings.updates().getNotifyAboutNewVersion());
 
-    cardDatabaseUpdateTrayNotificationCheckBox.setChecked(settings.updates().getCardDatabaseUpdateTrayNotification());
-
-    connect(&cardDatabaseUpdateTrayNotificationCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings.updates(),
-            &UpdatesSettings::setCardDatabaseUpdateTrayNotification);
-
     auto *cardDatabaseGrid = new QGridLayout;
     cardDatabaseGrid->addWidget(&startupCardUpdateCheckBehaviorLabel, 0, 0);
     cardDatabaseGrid->addWidget(&startupCardUpdateCheckBehaviorSelector, 0, 1);
     cardDatabaseGrid->addWidget(&cardUpdateCheckIntervalLabel, 1, 0);
     cardDatabaseGrid->addWidget(&cardUpdateCheckIntervalSpinBox, 1, 1);
     cardDatabaseGrid->addWidget(&lastCardUpdateCheckDateLabel, 2, 1);
-    cardDatabaseGrid->addWidget(&cardDatabaseUpdateTrayNotificationCheckBox, 3, 0, 1, 2);
 
     cardDatabaseGroupBox = new QGroupBox;
     cardDatabaseGroupBox->setLayout(cardDatabaseGrid);
@@ -379,9 +356,6 @@ void GeneralSettingsPage::deckPathButtonClicked()
     if (path.isEmpty()) {
         return;
     }
-    if (!PathSafetyWarning::confirmOutsideProgramDir(this, path)) {
-        return;
-    }
 
     deckPathEdit->setText(path);
     SettingsCache::instance().paths().setDeckPath(path);
@@ -393,9 +367,6 @@ void GeneralSettingsPage::filtersPathButtonClicked()
     if (path.isEmpty()) {
         return;
     }
-    if (!PathSafetyWarning::confirmOutsideProgramDir(this, path)) {
-        return;
-    }
 
     filtersPathEdit->setText(path);
     SettingsCache::instance().paths().setFiltersPath(path);
@@ -407,9 +378,6 @@ void GeneralSettingsPage::replaysPathButtonClicked()
     if (path.isEmpty()) {
         return;
     }
-    if (!PathSafetyWarning::confirmOutsideProgramDir(this, path)) {
-        return;
-    }
 
     replaysPathEdit->setText(path);
     SettingsCache::instance().paths().setReplaysPath(path);
@@ -421,9 +389,6 @@ void GeneralSettingsPage::picsPathButtonClicked()
     if (path.isEmpty()) {
         return;
     }
-    if (!PathSafetyWarning::confirmOutsideProgramDir(this, path)) {
-        return;
-    }
 
     picsPathEdit->setText(path);
     SettingsCache::instance().paths().setPicsPath(path);
@@ -435,9 +400,6 @@ void GeneralSettingsPage::cardDatabasePathButtonClicked()
     if (path.isEmpty()) {
         return;
     }
-    if (!PathSafetyWarning::confirmOutsideProgramDir(this, path)) {
-        return;
-    }
 
     cardDatabasePathEdit->setText(path);
     SettingsCache::instance().paths().setCardDatabasePath(path);
@@ -449,9 +411,6 @@ void GeneralSettingsPage::customCardDatabaseButtonClicked()
     if (path.isEmpty()) {
         return;
     }
-    if (!PathSafetyWarning::confirmOutsideProgramDir(this, path)) {
-        return;
-    }
 
     customCardDatabasePathEdit->setText(path);
     SettingsCache::instance().paths().setCustomCardDatabasePath(path);
@@ -463,9 +422,6 @@ void GeneralSettingsPage::tokenDatabasePathButtonClicked()
     if (path.isEmpty()) {
         return;
     }
-    if (!PathSafetyWarning::confirmOutsideProgramDir(this, path)) {
-        return;
-    }
 
     tokenDatabasePathEdit->setText(path);
     SettingsCache::instance().paths().setTokenDatabasePath(path);
@@ -593,7 +549,6 @@ void GeneralSettingsPage::retranslateUi()
                                                        tr("Always update in the background"));
     cardUpdateCheckIntervalLabel.setText(tr("Check for card database updates every"));
     cardUpdateCheckIntervalSpinBox.setSuffix(tr(" days"));
-    cardDatabaseUpdateTrayNotificationCheckBox.setText(tr("Notify in the system tray while the card database updates"));
 
     QDate lastCheckDate = settings.updates().getLastCardUpdateCheck();
     int daysAgo = lastCheckDate.daysTo(QDate::currentDate());
diff --git a/cockatrice/src/interface/widgets/settings_page/general_settings_page.h b/cockatrice/src/interface/widgets/settings_page/general_settings_page.h
index fcf1c78d0..07e0ba3a9 100644
--- a/cockatrice/src/interface/widgets/settings_page/general_settings_page.h
+++ b/cockatrice/src/interface/widgets/settings_page/general_settings_page.h
@@ -5,16 +5,11 @@
 
 #include <QCheckBox>
 #include <QComboBox>
+#include <QGroupBox>
 #include <QLabel>
 #include <QLoggingCategory>
+#include <QPushButton>
 #include <QSpinBox>
-#include <QString>
-#include <QStringList>
-#include <qtmetamacros.h>
-
-class QGroupBox;
-class QLineEdit;
-class QPushButton;
 
 inline Q_LOGGING_CATEGORY(GeneralSettingsPageLog, "general_settings_page");
 
@@ -75,7 +70,6 @@ private:
     QLabel cardUpdateCheckIntervalLabel;
     QSpinBox cardUpdateCheckIntervalSpinBox;
     QLabel lastCardUpdateCheckDateLabel;
-    QCheckBox cardDatabaseUpdateTrayNotificationCheckBox;
 
     QCheckBox showTipsOnStartup;
     QLabel startupTabLabel;
diff --git a/cockatrice/src/interface/widgets/settings_page/messages_settings_page.cpp b/cockatrice/src/interface/widgets/settings_page/messages_settings_page.cpp
index 9494155af..68e3f2ac7 100644
--- a/cockatrice/src/interface/widgets/settings_page/messages_settings_page.cpp
+++ b/cockatrice/src/interface/widgets/settings_page/messages_settings_page.cpp
@@ -3,27 +3,14 @@
 #include "../../../client/settings/cache_settings.h"
 #include "../../pixel_map_generator.h"
 #include "../interface/widgets/utility/get_text_with_max.h"
-#include "libcockatrice/utility/macros.h"
 
-#include <QAction>
-#include <QColor>
-#include <QDebug>
 #include <QGridLayout>
-#include <QGroupBox>
-#include <QHBoxLayout>
 #include <QLineEdit>
-#include <QListWidget>
-#include <QListWidgetItem>
-#include <QSizePolicy>
-#include <QStringLiteral>
 #include <QToolBar>
-#include <QVBoxLayout>
-#include <QtGlobal>
 #include <libcockatrice/settings/chat_settings.h>
 #include <libcockatrice/settings/message_settings.h>
 #include <libcockatrice/settings/personal_settings.h>
 #include <libcockatrice/utility/string_limits.h>
-#include <qnamespace.h>
 
 MessagesSettingsPage::MessagesSettingsPage()
 {
diff --git a/cockatrice/src/interface/widgets/settings_page/messages_settings_page.h b/cockatrice/src/interface/widgets/settings_page/messages_settings_page.h
index e85e6cca7..4d491136f 100644
--- a/cockatrice/src/interface/widgets/settings_page/messages_settings_page.h
+++ b/cockatrice/src/interface/widgets/settings_page/messages_settings_page.h
@@ -4,15 +4,10 @@
 #include "abstract_settings_page.h"
 
 #include <QCheckBox>
+#include <QGroupBox>
 #include <QLabel>
-#include <QString>
+#include <QListWidget>
 #include <libcockatrice/utility/macros.h>
-#include <qtmetamacros.h>
-
-class QAction;
-class QGroupBox;
-class QLineEdit;
-class QListWidget;
 
 class MessagesSettingsPage : public AbstractSettingsPage
 {
diff --git a/cockatrice/src/interface/widgets/settings_page/settings_search_delegate.cpp b/cockatrice/src/interface/widgets/settings_page/settings_search_delegate.cpp
index bf35b7557..2fdff3bce 100644
--- a/cockatrice/src/interface/widgets/settings_page/settings_search_delegate.cpp
+++ b/cockatrice/src/interface/widgets/settings_page/settings_search_delegate.cpp
@@ -7,24 +7,7 @@
 
 #include "settings_search_model.h"
 
-#include <QBrush>
-#include <QColor>
-#include <QFlags>
-#include <QFont>
-#include <QModelIndex>
 #include <QPainter>
-#include <QPalette>
-#include <QPen>
-#include <QRect>
-#include <QSize>
-#include <QStringLiteral>
-#include <QStyle>
-#include <QStyleOptionViewItem>
-#include <QVariant>
-#include <QtGlobal>
-#include <qnamespace.h>
-
-class QObject;
 
 SettingsSearchDelegate::SettingsSearchDelegate(QObject *parent) : QStyledItemDelegate(parent)
 {
diff --git a/cockatrice/src/interface/widgets/settings_page/settings_search_delegate.h b/cockatrice/src/interface/widgets/settings_page/settings_search_delegate.h
index 2e48a3de9..aa296049a 100644
--- a/cockatrice/src/interface/widgets/settings_page/settings_search_delegate.h
+++ b/cockatrice/src/interface/widgets/settings_page/settings_search_delegate.h
@@ -6,14 +6,8 @@
 #ifndef COCKATRICE_SETTINGS_SEARCH_DELEGATE_H
 #define COCKATRICE_SETTINGS_SEARCH_DELEGATE_H
 
-#include <QList>
 #include <QPixmap>
-#include <QString>
-#include <QStringList>
 #include <QStyledItemDelegate>
-#include <qtmetamacros.h>
-
-class QObject;
 
 /**
  * @brief Custom paint delegate for settings search result items
diff --git a/cockatrice/src/interface/widgets/settings_page/settings_search_model.cpp b/cockatrice/src/interface/widgets/settings_page/settings_search_model.cpp
index 015a7d45d..71f859d4b 100644
--- a/cockatrice/src/interface/widgets/settings_page/settings_search_model.cpp
+++ b/cockatrice/src/interface/widgets/settings_page/settings_search_model.cpp
@@ -6,14 +6,7 @@
 #include "settings_search_model.h"
 
 #include <QPair>
-#include <QSharedPointer>
-#include <QStringLiteral>
-#include <QVariant>
-#include <QWidget>
 #include <algorithm>
-#include <utility>
-
-class QObject;
 
 SettingsSearchModel::SettingsSearchModel(QObject *parent) : QAbstractListModel(parent)
 {
diff --git a/cockatrice/src/interface/widgets/settings_page/settings_search_model.h b/cockatrice/src/interface/widgets/settings_page/settings_search_model.h
index 902a29312..0b590f180 100644
--- a/cockatrice/src/interface/widgets/settings_page/settings_search_model.h
+++ b/cockatrice/src/interface/widgets/settings_page/settings_search_model.h
@@ -7,17 +7,9 @@
 #define COCKATRICE_SETTINGS_SEARCH_MODEL_H
 
 #include <QAbstractListModel>
-#include <QByteArray>
 #include <QList>
-#include <QMetaType>
-#include <QModelIndex>
 #include <QRegularExpression>
-#include <QString>
-#include <qnamespace.h>
-#include <qtmetamacros.h>
-
-class QObject;
-class QWidget;
+#include <QWidget>
 
 /**
  * @brief Represents a single searchable setting entry
diff --git a/cockatrice/src/interface/widgets/settings_page/shortcut_settings_page.cpp b/cockatrice/src/interface/widgets/settings_page/shortcut_settings_page.cpp
index ea7ed745c..1277d0e49 100644
--- a/cockatrice/src/interface/widgets/settings_page/shortcut_settings_page.cpp
+++ b/cockatrice/src/interface/widgets/settings_page/shortcut_settings_page.cpp
@@ -8,17 +8,8 @@
 #include "../interface/widgets/utility/sequence_edit.h"
 
 #include <QAbstractItemView>
-#include <QGridLayout>
-#include <QGroupBox>
-#include <QHBoxLayout>
-#include <QLabel>
 #include <QMessageBox>
-#include <QPushButton>
-#include <QSizePolicy>
-#include <QStringLiteral>
-#include <QVBoxLayout>
 #include <libcockatrice/settings/personal_settings.h>
-#include <qnamespace.h>
 
 ShortcutSettingsPage::ShortcutSettingsPage()
 {
diff --git a/cockatrice/src/interface/widgets/settings_page/shortcut_settings_page.h b/cockatrice/src/interface/widgets/settings_page/shortcut_settings_page.h
index 6ae7fbfa7..05391df77 100644
--- a/cockatrice/src/interface/widgets/settings_page/shortcut_settings_page.h
+++ b/cockatrice/src/interface/widgets/settings_page/shortcut_settings_page.h
@@ -3,18 +3,14 @@
 
 #include "abstract_settings_page.h"
 
-#include <QString>
-#include <qtmetamacros.h>
+#include <QGridLayout>
+#include <QGroupBox>
+#include <QLabel>
+#include <QPushButton>
 
 class SequenceEdit;
 class ShortcutTreeView;
 class SearchLineEdit;
-class QGridLayout;
-class QGroupBox;
-class QHBoxLayout;
-class QLabel;
-class QPushButton;
-class QVBoxLayout;
 
 class ShortcutSettingsPage : public AbstractSettingsPage
 {
diff --git a/cockatrice/src/interface/widgets/settings_page/sound_settings_page.cpp b/cockatrice/src/interface/widgets/settings_page/sound_settings_page.cpp
index 05725bb42..2bd776671 100644
--- a/cockatrice/src/interface/widgets/settings_page/sound_settings_page.cpp
+++ b/cockatrice/src/interface/widgets/settings_page/sound_settings_page.cpp
@@ -3,21 +3,10 @@
 #include "../../../client/settings/cache_settings.h"
 #include "../client/sound_engine.h"
 
-#include <QDebug>
 #include <QGridLayout>
-#include <QGroupBox>
-#include <QList>
-#include <QSharedPointer>
-#include <QSlider>
-#include <QSpinBox>
-#include <QString>
-#include <QStringList>
-#include <QVBoxLayout>
-#include <QtGlobal>
 #include <libcockatrice/settings/personal_settings.h>
 #include <libcockatrice/settings/sound_settings.h>
 #include <libcockatrice/utility/macros.h>
-#include <qnamespace.h>
 
 SoundSettingsPage::SoundSettingsPage()
 {
diff --git a/cockatrice/src/interface/widgets/settings_page/sound_settings_page.h b/cockatrice/src/interface/widgets/settings_page/sound_settings_page.h
index acaa4f7c4..f90bcbc5a 100644
--- a/cockatrice/src/interface/widgets/settings_page/sound_settings_page.h
+++ b/cockatrice/src/interface/widgets/settings_page/sound_settings_page.h
@@ -5,13 +5,10 @@
 
 #include <QCheckBox>
 #include <QComboBox>
+#include <QGroupBox>
 #include <QLabel>
 #include <QPushButton>
-#include <qtmetamacros.h>
-
-class QGroupBox;
-class QSlider;
-class QSpinBox;
+#include <QSpinBox>
 
 class SoundSettingsPage : public AbstractSettingsPage
 {
diff --git a/cockatrice/src/interface/widgets/settings_page/storage_settings_page.cpp b/cockatrice/src/interface/widgets/settings_page/storage_settings_page.cpp
index a71296820..4aad91115 100644
--- a/cockatrice/src/interface/widgets/settings_page/storage_settings_page.cpp
+++ b/cockatrice/src/interface/widgets/settings_page/storage_settings_page.cpp
@@ -5,21 +5,12 @@
 #include "../../card_picture_loader/card_picture_loader_local_schemes.h"
 #include "../interface/card_picture_loader/card_picture_loader.h"
 
-#include <QComboBox>
 #include <QDir>
 #include <QGridLayout>
-#include <QGroupBox>
-#include <QHBoxLayout>
-#include <QList>
 #include <QMessageBox>
-#include <QString>
-#include <QVBoxLayout>
-#include <QVariant>
-#include <QtGlobal>
 #include <libcockatrice/settings/cache_storage_settings.h>
 #include <libcockatrice/settings/paths_settings.h>
 #include <libcockatrice/settings/personal_settings.h>
-#include <qnamespace.h>
 
 StorageSettingsPage::StorageSettingsPage()
 {
diff --git a/cockatrice/src/interface/widgets/settings_page/storage_settings_page.h b/cockatrice/src/interface/widgets/settings_page/storage_settings_page.h
index 1c9a35323..5c8a00981 100644
--- a/cockatrice/src/interface/widgets/settings_page/storage_settings_page.h
+++ b/cockatrice/src/interface/widgets/settings_page/storage_settings_page.h
@@ -3,13 +3,11 @@
 
 #include "abstract_settings_page.h"
 
+#include <QComboBox>
+#include <QGroupBox>
 #include <QLabel>
 #include <QPushButton>
 #include <QSpinBox>
-#include <qtmetamacros.h>
-
-class QComboBox;
-class QGroupBox;
 
 class StorageSettingsPage : public AbstractSettingsPage
 {
diff --git a/cockatrice/src/interface/widgets/settings_page/user_interface_settings_page.cpp b/cockatrice/src/interface/widgets/settings_page/user_interface_settings_page.cpp
index 0a5f57e1f..03b9455fa 100644
--- a/cockatrice/src/interface/widgets/settings_page/user_interface_settings_page.cpp
+++ b/cockatrice/src/interface/widgets/settings_page/user_interface_settings_page.cpp
@@ -3,22 +3,13 @@
 #include "../../../client/settings/cache_settings.h"
 #include "../interface/widgets/tabs/tab_supervisor.h"
 #include "../tabs/api/commander_spellbook/commander_spellbook_bracket_explainer.h"
-#include "libcockatrice/utility/macros.h"
 
-#include <QDebug>
 #include <QGridLayout>
-#include <QGroupBox>
-#include <QHBoxLayout>
-#include <QVBoxLayout>
-#include <QVariant>
-#include <QWidget>
-#include <QtGlobal>
 #include <libcockatrice/settings/cards_display_settings.h>
 #include <libcockatrice/settings/deck_editor_settings.h>
 #include <libcockatrice/settings/interface_settings.h>
 #include <libcockatrice/settings/personal_settings.h>
 #include <libcockatrice/settings/visual_deck_storage_settings.h>
-#include <qnamespace.h>
 
 enum visualDeckStoragePromptForConversionIndex
 {
diff --git a/cockatrice/src/interface/widgets/settings_page/user_interface_settings_page.h b/cockatrice/src/interface/widgets/settings_page/user_interface_settings_page.h
index 297d80c35..277c5461e 100644
--- a/cockatrice/src/interface/widgets/settings_page/user_interface_settings_page.h
+++ b/cockatrice/src/interface/widgets/settings_page/user_interface_settings_page.h
@@ -5,14 +5,13 @@
 
 #include <QCheckBox>
 #include <QComboBox>
+#include <QGroupBox>
 #include <QLabel>
 #include <QPushButton>
 #include <QSpinBox>
 #include <QToolButton>
+#include <libcockatrice/settings/cards_display_settings.h>
 #include <libcockatrice/utility/macros.h>
-#include <qtmetamacros.h>
-
-class QGroupBox;
 
 class UserInterfaceSettingsPage : public AbstractSettingsPage
 {
diff --git a/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp b/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp
index 4044f03db..6423c581b 100644
--- a/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp
+++ b/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp
@@ -11,49 +11,35 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../../client/settings/shortcuts_settings.h"
-#include "../../deck_loader/deck_file_format.h"
-#include "../../deck_loader/deck_loader.h"
-#include "../../deck_loader/loaded_deck.h"
 #include "../cards/additional_info/deck_color_identity.h"
-#include "../cards/card_info_frame_widget.h"
 #include "../client/network/interfaces/deck_stats_interface.h"
 #include "../client/network/interfaces/tapped_out_interface.h"
-#include "../deck_editor/deck_editor_card_database_dock_widget.h"
-#include "../deck_editor/deck_editor_card_info_dock_widget.h"
-#include "../deck_editor/deck_editor_deck_dock_widget.h"
-#include "../deck_editor/deck_editor_filter_dock_widget.h"
-#include "../deck_editor/deck_editor_printing_selector_dock_widget.h"
 #include "../deck_editor/deck_state_manager.h"
 #include "../interface/card_picture_loader/card_picture_loader.h"
+#include "../interface/pixel_map_generator.h"
 #include "../interface/widgets/dialogs/dlg_load_deck.h"
 #include "../interface/widgets/dialogs/dlg_load_deck_from_clipboard.h"
 #include "../interface/widgets/dialogs/dlg_load_deck_from_website.h"
 #include "../interface/widgets/dialogs/dlg_share_deck.h"
-#include "../menus/deck_editor_menu.h"
-#include "../printing_selector/printing_selector.h"
 #include "../utility/visibility_change_listener.h"
-#include "libcockatrice/card/database/card_database_querier.h"
-#include "libcockatrice/card/printing/exact_card.h"
-#include "libcockatrice/deck_list/deck_list.h"
-#include "libcockatrice/utility/card_ref.h"
 #include "tab_supervisor.h"
 
 #include <QAction>
+#include <QApplication>
 #include <QCloseEvent>
 #include <QDesktopServices>
-#include <QDockWidget>
 #include <QFileDialog>
-#include <QFlags>
-#include <QList>
-#include <QMainWindow>
-#include <QMenu>
+#include <QHeaderView>
+#include <QLineEdit>
 #include <QMessageBox>
 #include <QPrintPreviewDialog>
 #include <QPrinter>
+#include <QProcessEnvironment>
 #include <QPushButton>
-#include <QSharedPointer>
+#include <QRegularExpression>
+#include <QSplitter>
+#include <QTreeView>
 #include <QUrl>
-#include <google/protobuf/stubs/port.h>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/models/database/card_database_model.h>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
@@ -64,8 +50,6 @@
 #include <libcockatrice/settings/paths_settings.h>
 #include <libcockatrice/settings/recents_settings.h>
 #include <libcockatrice/utility/string_limits.h>
-#include <optional>
-#include <string>
 
 /**
  * @brief Constructs the AbstractTabDeckEditor.
diff --git a/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.h b/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.h
index 1782e7afd..dae8f5b0a 100644
--- a/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.h
+++ b/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.h
@@ -9,31 +9,48 @@
 #define TAB_GENERIC_DECK_EDITOR_H
 
 #include "../../deck_loader/deck_loader.h"
-#include "libcockatrice/card/card_info.h"
+#include "../interface/widgets/deck_editor/deck_editor_card_database_dock_widget.h"
+#include "../interface/widgets/deck_editor/deck_editor_card_info_dock_widget.h"
+#include "../interface/widgets/deck_editor/deck_editor_database_display_widget.h"
+#include "../interface/widgets/deck_editor/deck_editor_deck_dock_widget.h"
+#include "../interface/widgets/deck_editor/deck_editor_filter_dock_widget.h"
+#include "../interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.h"
+#include "../interface/widgets/menus/deck_editor_menu.h"
+#include "../interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h"
 #include "tab.h"
 
-#include <QMap>
-#include <QSize>
-#include <QString>
-#include <qtmetamacros.h>
+#include <libcockatrice/deck_list/deck_list_history_manager.h>
 
 class DeckStateManager;
 class CardDatabaseModel;
+class CardDatabaseDisplayModel;
+
+class CardInfoFrameWidget;
+class DeckLoader;
 class DeckEditorMenu;
 class DeckEditorCardInfoDockWidget;
 class DeckEditorCardDatabaseDockWidget;
 class DeckEditorDeckDockWidget;
 class DeckEditorFilterDockWidget;
 class DeckEditorPrintingSelectorDockWidget;
+class DeckPreviewDeckTagsDisplayWidget;
 class Response;
 class FilterTree;
+class FilterTreeModel;
+class FilterBuilder;
+
+class QTreeView;
+class QTextEdit;
+class QLabel;
+class QComboBox;
+class QGroupBox;
 class QMessageBox;
+class QHBoxLayout;
+class QVBoxLayout;
+class QPushButton;
 class QDockWidget;
 class QMenu;
 class QAction;
-class ExactCard;
-class TabSupervisor;
-struct LoadedDeck;
 
 /**
  * @class AbstractTabDeckEditor
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/archidekt_deck_listing_api_response.cpp b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/archidekt_deck_listing_api_response.cpp
index 8d023cd61..40882db04 100644
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/archidekt_deck_listing_api_response.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/archidekt_deck_listing_api_response.cpp
@@ -2,9 +2,6 @@
 
 #include <QDebug>
 #include <QJsonArray>
-#include <QJsonValue>
-#include <QJsonValueRef>
-#include <qlogging.h>
 
 void ArchidektDeckListingApiResponse::fromJson(const QJsonObject &json)
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/archidekt_deck_listing_api_response.h b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/archidekt_deck_listing_api_response.h
index c42bc1315..723c65ce2 100644
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/archidekt_deck_listing_api_response.h
+++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/archidekt_deck_listing_api_response.h
@@ -4,9 +4,8 @@
 #include "deck_listings/archidekt_api_response_deck_listing_container.h"
 
 #include <QJsonObject>
-#include <QList>
+#include <QString>
 #include <QUrl>
-#include <QVector>
 
 class ArchidektDeckListingApiResponse
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_card.cpp b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_card.cpp
index d118301bb..46c229156 100644
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_card.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_card.cpp
@@ -1,9 +1,5 @@
 #include "archidekt_api_response_card.h"
 
-#include <QDebug>
-#include <QJsonValue>
-#include <qlogging.h>
-
 void ArchidektApiResponseCard::fromJson(const QJsonObject &json)
 {
     id = json.value("id").toInt();
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_card.h b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_card.h
index 8e9e0b12a..559580da2 100644
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_card.h
+++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_card.h
@@ -3,10 +3,11 @@
 
 #include "archidekt_api_response_edition.h"
 
+#include <QDebug>
+#include <QJsonArray>
 #include <QJsonObject>
-#include <QList>
 #include <QString>
-#include <QStringList>
+#include <QVector>
 
 class ArchidektApiResponseCard
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_card_entry.cpp b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_card_entry.cpp
index 14b13a4ed..f51d0f3e7 100644
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_card_entry.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_card_entry.cpp
@@ -1,11 +1,5 @@
 #include "archidekt_api_response_card_entry.h"
 
-#include <QDebug>
-#include <QJsonArray>
-#include <QJsonValue>
-#include <QJsonValueRef>
-#include <qlogging.h>
-
 void ArchidektApiResponseCardEntry::fromJson(const QJsonObject &json)
 {
     id = json.value("id").toInt();
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_card_entry.h b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_card_entry.h
index eb7c4190c..118cf5b13 100644
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_card_entry.h
+++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_card_entry.h
@@ -3,10 +3,11 @@
 
 #include "archidekt_api_response_card.h"
 
+#include <QDebug>
+#include <QJsonArray>
 #include <QJsonObject>
-#include <QList>
 #include <QString>
-#include <QStringList>
+#include <QVector>
 
 struct Category
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_edition.cpp b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_edition.cpp
index 73836b9c8..122617a22 100644
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_edition.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_edition.cpp
@@ -1,9 +1,5 @@
 #include "archidekt_api_response_edition.h"
 
-#include <QDebug>
-#include <QJsonValue>
-#include <qlogging.h>
-
 void ArchidektApiResponseEdition::fromJson(const QJsonObject &json)
 {
     editionCode = json.value("editioncode").toString();
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_edition.h b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_edition.h
index 63d29652f..b898cd816 100644
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_edition.h
+++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_edition.h
@@ -1,8 +1,11 @@
 #ifndef COCKATRICE_ARCHIDEKT_API_RESPONSE_EDITION_H
 #define COCKATRICE_ARCHIDEKT_API_RESPONSE_EDITION_H
 
+#include <QDebug>
+#include <QJsonArray>
 #include <QJsonObject>
 #include <QString>
+#include <QVector>
 
 class ArchidektApiResponseEdition
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck/archidekt_api_response_deck.cpp b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck/archidekt_api_response_deck.cpp
index 362ac0f63..a27d8d961 100644
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck/archidekt_api_response_deck.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck/archidekt_api_response_deck.cpp
@@ -1,13 +1,6 @@
 #include "archidekt_api_response_deck.h"
 
 #include "../card/archidekt_api_response_card_entry.h"
-#include "../deck_listings/archidekt_api_response_deck_owner.h"
-
-#include <QDebug>
-#include <QJsonArray>
-#include <QJsonValue>
-#include <QJsonValueRef>
-#include <qlogging.h>
 
 void ArchidektApiResponseDeck::fromJson(const QJsonObject &json)
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck/archidekt_api_response_deck.h b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck/archidekt_api_response_deck.h
index 6af0a01c5..b539d9dd1 100644
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck/archidekt_api_response_deck.h
+++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck/archidekt_api_response_deck.h
@@ -1,14 +1,15 @@
 #ifndef COCKATRICE_ARCHIDEKT_API_RESPONSE_DECK_H
 #define COCKATRICE_ARCHIDEKT_API_RESPONSE_DECK_H
 
+#include "../card/archidekt_api_response_card.h"
 #include "../card/archidekt_api_response_card_entry.h"
 #include "../deck_listings/archidekt_api_response_deck_owner.h"
 #include "archidekt_api_response_deck_category.h"
 
+#include <QDebug>
+#include <QJsonArray>
 #include <QJsonObject>
-#include <QList>
 #include <QString>
-#include <QStringList>
 #include <QVector>
 
 class ArchidektApiResponseDeck
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck/archidekt_api_response_deck_category.cpp b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck/archidekt_api_response_deck_category.cpp
index 0df8b9f68..990293bc6 100644
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck/archidekt_api_response_deck_category.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck/archidekt_api_response_deck_category.cpp
@@ -1,9 +1,5 @@
 #include "archidekt_api_response_deck_category.h"
 
-#include <QDebug>
-#include <QJsonValue>
-#include <qlogging.h>
-
 void ArchidektApiResponseDeckCategory::fromJson(const QJsonObject &json)
 {
     id = json.value("id").toInt();
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck/archidekt_api_response_deck_category.h b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck/archidekt_api_response_deck_category.h
index b31743643..5e218b6a4 100644
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck/archidekt_api_response_deck_category.h
+++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck/archidekt_api_response_deck_category.h
@@ -1,8 +1,15 @@
 #ifndef COCKATRICE_ARCHIDEKT_API_RESPONSE_DECK_CATEGORY_H
 #define COCKATRICE_ARCHIDEKT_API_RESPONSE_DECK_CATEGORY_H
 
+#include "../card/archidekt_api_response_card.h"
+#include "../card/archidekt_api_response_card_entry.h"
+#include "../deck_listings/archidekt_api_response_deck_owner.h"
+
+#include <QDebug>
+#include <QJsonArray>
 #include <QJsonObject>
 #include <QString>
+#include <QVector>
 
 class ArchidektApiResponseDeckCategory
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck_listings/archidekt_api_response_deck_listing_container.cpp b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck_listings/archidekt_api_response_deck_listing_container.cpp
index 0f5290f02..416621b41 100644
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck_listings/archidekt_api_response_deck_listing_container.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck_listings/archidekt_api_response_deck_listing_container.cpp
@@ -3,10 +3,8 @@
 #include "archidekt_api_response_deck_owner.h"
 
 #include <QDebug>
+#include <QJsonArray>
 #include <QJsonObject>
-#include <QJsonValue>
-#include <QJsonValueRef>
-#include <qlogging.h>
 
 void ArchidektApiResponseDeckListingContainer::fromJson(const QJsonObject &json)
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck_listings/archidekt_api_response_deck_listing_container.h b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck_listings/archidekt_api_response_deck_listing_container.h
index 904d6b624..8924bb3f5 100644
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck_listings/archidekt_api_response_deck_listing_container.h
+++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck_listings/archidekt_api_response_deck_listing_container.h
@@ -3,11 +3,11 @@
 
 #include "archidekt_api_response_deck_owner.h"
 
+#include <QDebug>
+#include <QJsonArray>
 #include <QJsonObject>
-#include <QList>
-#include <QMap>
 #include <QString>
-#include <QStringList>
+#include <QVector>
 
 class ArchidektApiResponseDeckListingContainer
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck_listings/archidekt_api_response_deck_owner.cpp b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck_listings/archidekt_api_response_deck_owner.cpp
index 67b80d67a..3d6eac03d 100644
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck_listings/archidekt_api_response_deck_owner.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck_listings/archidekt_api_response_deck_owner.cpp
@@ -1,9 +1,5 @@
 #include "archidekt_api_response_deck_owner.h"
 
-#include <QDebug>
-#include <QJsonValue>
-#include <qlogging.h>
-
 void ArchidektApiResponseDeckOwner::fromJson(const QJsonObject &json)
 {
     id = json.value("id").toInt();
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck_listings/archidekt_api_response_deck_owner.h b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck_listings/archidekt_api_response_deck_owner.h
index f63d6af0e..df3f48fd2 100644
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck_listings/archidekt_api_response_deck_owner.h
+++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck_listings/archidekt_api_response_deck_owner.h
@@ -1,11 +1,11 @@
 #ifndef COCKATRICE_ARCHIDEKT_API_RESPONSE_DECK_OWNER_H
 #define COCKATRICE_ARCHIDEKT_API_RESPONSE_DECK_OWNER_H
 
+#include <QDebug>
+#include <QJsonArray>
 #include <QJsonObject>
-#include <QList>
 #include <QString>
-#include <QStringList>
-#include <QUrl>
+#include <QVector>
 
 class ArchidektApiResponseDeckOwner
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp
index 555ec7ec5..657ef3dbe 100644
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp
@@ -2,39 +2,16 @@
 
 #include "../../../../../../client/settings/cache_settings.h"
 #include "../../../../../deck_loader/card_node_function.h"
-#include "../../../../../deck_loader/loaded_deck.h"
+#include "../../../../../deck_loader/deck_loader.h"
+#include "../../../../cards/card_size_widget.h"
 #include "../../../../cards/deck_card_zone_display_widget.h"
 #include "../../../../visual_deck_editor/visual_deck_display_options_widget.h"
-#include "../../../../visual_deck_editor/visual_deck_editor_widget.h"
 #include "../api_response/archidekt_formats.h"
-#include "../api_response/card/archidekt_api_response_card.h"
-#include "../api_response/card/archidekt_api_response_card_entry.h"
-#include "../api_response/card/archidekt_api_response_edition.h"
 #include "../api_response/deck/archidekt_api_response_deck.h"
-#include "deck_list_model.h"
-#include "libcockatrice/deck_list/deck_list.h"
 
-#include <QAbstractListModel>
-#include <QDebug>
-#include <QHBoxLayout>
-#include <QJsonObject>
-#include <QJsonValue>
-#include <QList>
-#include <QModelIndex>
-#include <QPushButton>
-#include <QScrollArea>
-#include <QSharedPointer>
 #include <QSortFilterProxyModel>
-#include <QTextStream>
-#include <QVBoxLayout>
-#include <QVariant>
-#include <functional>
 #include <libcockatrice/card/import/card_name_normalizer.h>
 #include <libcockatrice/settings/cards_display_settings.h>
-#include <qlogging.h>
-#include <qnamespace.h>
-
-class CardSizeWidget;
 
 ArchidektApiResponseDeckDisplayWidget::ArchidektApiResponseDeckDisplayWidget(QWidget *parent,
                                                                              ArchidektApiResponseDeck _response,
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.h b/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.h
index cdacc70b3..aaf272718 100644
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.h
+++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.h
@@ -1,22 +1,18 @@
 #ifndef COCKATRICE_ARCHIDEKT_API_RESPONSE_DECK_DISPLAY_WIDGET_H
 #define COCKATRICE_ARCHIDEKT_API_RESPONSE_DECK_DISPLAY_WIDGET_H
 
+#include "../../../../../deck_loader/deck_loader.h"
+#include "../../../../cards/card_size_widget.h"
+#include "../../../../general/layout_containers/flow_widget.h"
+#include "../../../../visual_deck_editor/visual_deck_display_options_widget.h"
 #include "../api_response/deck/archidekt_api_response_deck.h"
+#include "deck_list_model.h"
 
-#include <QHash>
-#include <QPersistentModelIndex>
-#include <QString>
+#include <QPushButton>
+#include <QResizeEvent>
+#include <QScrollArea>
+#include <QVBoxLayout>
 #include <QWidget>
-#include <qtmetamacros.h>
-
-class CardSizeWidget;
-class DeckListModel;
-class QHBoxLayout;
-class QPushButton;
-class QScrollArea;
-class QVBoxLayout;
-class VisualDeckDisplayOptionsWidget;
-struct LoadedDeck;
 
 /**
  * @class ArchidektApiResponseDeckDisplayWidget
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_entry_display_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_entry_display_widget.cpp
index b5e28fcf5..c35c2d0b8 100644
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_entry_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_entry_display_widget.cpp
@@ -1,30 +1,17 @@
 #include "archidekt_api_response_deck_entry_display_widget.h"
 
 #include "../../../../../card_picture_loader/card_picture_loader.h"
+#include "../../../../cards/card_info_picture_with_text_overlay_widget.h"
 #include "../../../../general/display/background_plate_widget.h"
 #include "../../../../general/display/charts/bars/color_bar.h"
-#include "../../../../general/display/shadow_background_label.h"
-#include "../api_response/deck_listings/archidekt_api_response_deck_listing_container.h"
-#include "../api_response/deck_listings/archidekt_api_response_deck_owner.h"
 #include "archidekt_deck_preview_image_display_widget.h"
 
-#include <QByteArray>
-#include <QDateTime>
-#include <QFontMetrics>
+#include <QHBoxLayout>
 #include <QLabel>
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
-#include <QNetworkRequest>
 #include <QPixmap>
-#include <QRect>
-#include <QSharedPointer>
-#include <QSize>
-#include <QSizePolicy>
-#include <QVBoxLayout>
-#include <QVariant>
 #include <QWidget>
-#include <QtGlobal>
-#include <qnamespace.h>
 #include <version_string.h>
 
 #define ARCHIDEKT_DEFAULT_IMAGE "https://storage.googleapis.com/topdekt-user/images/archidekt_deck_card_shadow.jpg"
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_entry_display_widget.h b/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_entry_display_widget.h
index e8ed8561d..575a81b5f 100644
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_entry_display_widget.h
+++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_entry_display_widget.h
@@ -1,20 +1,17 @@
 #ifndef COCKATRICE_ARCHIDEKT_API_RESPONSE_DECK_ENTRY_DISPLAY_WIDGET_H
 #define COCKATRICE_ARCHIDEKT_API_RESPONSE_DECK_ENTRY_DISPLAY_WIDGET_H
 
+#include "../../../../cards/card_info_picture_with_text_overlay_widget.h"
 #include "../api_response/deck_listings/archidekt_api_response_deck_listing_container.h"
+#include "archidekt_deck_preview_image_display_widget.h"
 
-#include <QPixmap>
-#include <QString>
-#include <QUrl>
+#include <QLabel>
+#include <QNetworkAccessManager>
+#include <QResizeEvent>
+#include <QVBoxLayout>
 #include <QWidget>
-#include <qtmetamacros.h>
 
 class BackgroundPlateWidget;
-class ArchidektDeckPreviewImageDisplayWidget;
-class QLabel;
-class QNetworkAccessManager;
-class QNetworkReply;
-class QVBoxLayout;
 
 /**
  * @class ArchidektApiResponseDeckEntryDisplayWidget
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_listings_display_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_listings_display_widget.cpp
index 9c4ea59ab..21e8e3f9a 100644
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_listings_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_listings_display_widget.cpp
@@ -1,18 +1,8 @@
 #include "archidekt_api_response_deck_listings_display_widget.h"
 
-#include "../../../../cards/card_size_widget.h"
-#include "../../../../general/layout_containers/flow_widget.h"
-#include "../api_response/archidekt_deck_listing_api_response.h"
-#include "../api_response/deck_listings/archidekt_api_response_deck_listing_container.h"
+#include "../../../../cards/card_info_picture_with_text_overlay_widget.h"
 #include "archidekt_api_response_deck_entry_display_widget.h"
 
-#include <QHBoxLayout>
-#include <QList>
-#include <QNetworkAccessManager>
-#include <QNetworkRequest>
-#include <QSlider>
-#include <qnamespace.h>
-
 ArchidektApiResponseDeckListingsDisplayWidget::ArchidektApiResponseDeckListingsDisplayWidget(
     QWidget *parent,
     ArchidektDeckListingApiResponse response,
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_listings_display_widget.h b/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_listings_display_widget.h
index a9a7da7a1..f9a887aa4 100644
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_listings_display_widget.h
+++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_listings_display_widget.h
@@ -1,15 +1,15 @@
 #ifndef COCKATRICE_ARCHIDEKT_API_RESPONSE_DECK_LISTINGS_DISPLAY_WIDGET_H
 #define COCKATRICE_ARCHIDEKT_API_RESPONSE_DECK_LISTINGS_DISPLAY_WIDGET_H
 
-#include <QString>
-#include <QWidget>
-#include <qtmetamacros.h>
+#include "../../../../cards/card_size_widget.h"
+#include "../../../../general/layout_containers/flow_widget.h"
+#include "../api_response/archidekt_deck_listing_api_response.h"
 
-class ArchidektDeckListingApiResponse;
-class CardSizeWidget;
-class FlowWidget;
-class QHBoxLayout;
-class QNetworkAccessManager;
+#include <QNetworkAccessManager>
+#include <QResizeEvent>
+#include <QScrollArea>
+#include <QVBoxLayout>
+#include <QWidget>
 
 /**
  * @class ArchidektApiResponseDeckListingsDisplayWidget
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_deck_preview_image_display_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_deck_preview_image_display_widget.cpp
index 97383534f..ced08491e 100644
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_deck_preview_image_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_deck_preview_image_display_widget.cpp
@@ -1,11 +1,7 @@
 #include "archidekt_deck_preview_image_display_widget.h"
 
-#include "../../../../general/display/shadow_background_label.h"
-
-#include <QFont>
-#include <QLabel>
-#include <QString>
-#include <qnamespace.h>
+#include <QFontMetrics>
+#include <QPainter>
 
 ArchidektDeckPreviewImageDisplayWidget::ArchidektDeckPreviewImageDisplayWidget(QWidget *parent) : QWidget(parent)
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_deck_preview_image_display_widget.h b/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_deck_preview_image_display_widget.h
index 991f27b6a..053823c45 100644
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_deck_preview_image_display_widget.h
+++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_deck_preview_image_display_widget.h
@@ -1,11 +1,10 @@
 #ifndef COCKATRICE_ARCHIDEKT_DECK_PREVIEW_IMAGE_DISPLAY_WIDGET_H
 #define COCKATRICE_ARCHIDEKT_DECK_PREVIEW_IMAGE_DISPLAY_WIDGET_H
 
-#include <QWidget>
-#include <qtmetamacros.h>
+#include "../../../../general/display/shadow_background_label.h"
 
-class QLabel;
-class ShadowBackgroundLabel;
+#include <QLabel>
+#include <QWidget>
 
 /**
  * @class ArchidektDeckPreviewImageDisplayWidget
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp b/cockatrice/src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp
index 02badf1aa..888197f53 100644
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp
@@ -3,54 +3,31 @@
 #include "../../../../../client/settings/cache_settings.h"
 #include "../../../../pixel_map_generator.h"
 #include "../../../cards/additional_info/mana_symbol_widget.h"
-#include "../../../cards/card_size_widget.h"
-#include "../../../quick_settings/settings_button_widget.h"
 #include "../../../utility/completer_utils.h"
-#include "../../tab.h"
 #include "../../tab_supervisor.h"
 #include "api_response/archidekt_deck_listing_api_response.h"
-#include "api_response/deck/archidekt_api_response_deck.h"
-#include "card_database_display_model.h"
-#include "card_database_model.h"
 #include "display/archidekt_api_response_deck_display_widget.h"
 #include "display/archidekt_api_response_deck_listings_display_widget.h"
 
-#include <QByteArray>
-#include <QCheckBox>
-#include <QComboBox>
 #include <QDebug>
-#include <QEvent>
+#include <QFormLayout>
 #include <QGridLayout>
+#include <QGroupBox>
 #include <QHBoxLayout>
 #include <QJsonArray>
 #include <QJsonDocument>
 #include <QJsonObject>
-#include <QJsonValueRef>
-#include <QLabel>
-#include <QLayoutItem>
-#include <QLineEdit>
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
-#include <QNetworkRequest>
-#include <QPoint>
 #include <QPushButton>
+#include <QResizeEvent>
 #include <QScrollArea>
-#include <QSharedPointer>
-#include <QSizePolicy>
-#include <QSpinBox>
-#include <QStringList>
-#include <QStringLiteral>
-#include <QTimer>
-#include <QUrl>
+#include <QScrollBar>
 #include <QUrlQuery>
-#include <QVBoxLayout>
-#include <QWheelEvent>
-#include <QWidget>
-#include <QtGlobal>
 #include <libcockatrice/card/database/card_database_manager.h>
+#include <libcockatrice/models/database/card/card_completer_proxy_model.h>
+#include <libcockatrice/models/database/card/card_search_model.h>
 #include <libcockatrice/settings/cards_display_settings.h>
-#include <qlogging.h>
-#include <qnamespace.h>
 #include <version_string.h>
 
 TabArchidekt::TabArchidekt(TabSupervisor *_tabSupervisor)
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/tab_archidekt.h b/cockatrice/src/interface/widgets/tabs/api/archidekt/tab_archidekt.h
index 015b8590b..e837e672b 100644
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/tab_archidekt.h
+++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/tab_archidekt.h
@@ -1,35 +1,26 @@
 #ifndef COCKATRICE_TAB_ARCHIDEKT_H
 #define COCKATRICE_TAB_ARCHIDEKT_H
 
+#include "../../interface/widgets/cards/card_size_widget.h"
+#include "../../interface/widgets/quick_settings/settings_button_widget.h"
 #include "../../tab.h"
-#include "libcockatrice/card/card_info.h"
+#include "display/archidekt_api_response_deck_listings_display_widget.h"
 
-#include <QChar>
-#include <QJsonObject>
-#include <QJsonValue>
-#include <QList>
+#include <QCheckBox>
+#include <QComboBox>
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QLineEdit>
+#include <QNetworkAccessManager>
+#include <QPushButton>
+#include <QScrollArea>
 #include <QSet>
+#include <QSpinBox>
 #include <QString>
-#include <QVector>
-#include <qtmetamacros.h>
-
-class ArchidektApiResponseDeckListingsDisplayWidget;
-class CardSizeWidget;
-class QCheckBox;
-class QComboBox;
-class QHBoxLayout;
-class QLabel;
-class QLineEdit;
-class QNetworkAccessManager;
-class QNetworkReply;
-class QPushButton;
-class QScrollArea;
-class QSpinBox;
-class QTimer;
-class QVBoxLayout;
-class QWidget;
-class SettingsButtonWidget;
-class TabSupervisor;
+#include <QTimer>
+#include <QVBoxLayout>
+#include <QWidget>
+#include <libcockatrice/card/database/card_database.h>
 
 /** Base API link for Archidekt deck search */
 inline QString archidektApiLink = "https://archidekt.com/api/decks/v3/?name=";
diff --git a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/card_in_deck_request.cpp b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/card_in_deck_request.cpp
index aa892d0d4..3c95a4553 100644
--- a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/card_in_deck_request.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/card_in_deck_request.cpp
@@ -1,7 +1,5 @@
 #include "card_in_deck_request.h"
 
-#include <QJsonValue>
-
 CardInDeckRequest CardInDeckRequest::fromJson(const QJsonObject &json)
 {
     CardInDeckRequest request;
diff --git a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/card_in_deck_request.h b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/card_in_deck_request.h
index 6bcaca42f..b7eb96211 100644
--- a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/card_in_deck_request.h
+++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/card_in_deck_request.h
@@ -1,7 +1,6 @@
 #ifndef COCKATRICE_CARD_IN_DECK_REQUEST_H
 #define COCKATRICE_CARD_IN_DECK_REQUEST_H
 #include <QJsonObject>
-#include <QString>
 
 struct CardInDeckRequest
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/commander_spellbook_card_result.cpp b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/commander_spellbook_card_result.cpp
index 0ae5dd360..14558d234 100644
--- a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/commander_spellbook_card_result.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/commander_spellbook_card_result.cpp
@@ -1,7 +1,5 @@
 #include "commander_spellbook_card_result.h"
 
-#include <QJsonValue>
-
 CommanderSpellbookCardResult CommanderSpellbookCardResult::fromJson(const QJsonObject &json)
 {
     CommanderSpellbookCardResult result;
diff --git a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/commander_spellbook_deck_request.cpp b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/commander_spellbook_deck_request.cpp
index ac259f3aa..166469353 100644
--- a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/commander_spellbook_deck_request.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/commander_spellbook_deck_request.cpp
@@ -1,14 +1,6 @@
 #include "commander_spellbook_deck_request.h"
 
-#include "libcockatrice/deck_list/deck_list.h"
-#include "libcockatrice/deck_list/tree/inner_deck_list_node.h"
-#include "libcockatrice/utility/card_ref.h"
-
 #include <QJsonArray>
-#include <QJsonValue>
-#include <QJsonValueConstRef>
-#include <QSet>
-#include <QString>
 #include <libcockatrice/deck_list/tree/deck_list_card_node.h>
 
 CommanderSpellbookDeckRequest CommanderSpellbookDeckRequest::fromJson(const QJsonObject &json)
diff --git a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/commander_spellbook_deck_request.h b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/commander_spellbook_deck_request.h
index 002f7666f..46d8e053b 100644
--- a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/commander_spellbook_deck_request.h
+++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/commander_spellbook_deck_request.h
@@ -1,12 +1,11 @@
 #ifndef COCKATRICE_COMMANDER_SPELLBOOK_DECK_REQUEST_H
 #define COCKATRICE_COMMANDER_SPELLBOOK_DECK_REQUEST_H
 #include "card_in_deck_request.h"
+#include "libcockatrice/deck_list/deck_list.h"
 
 #include <QJsonObject>
 #include <QList>
 
-class DeckList;
-
 struct CommanderSpellbookDeckRequest
 {
     static CommanderSpellbookDeckRequest fromJson(const QJsonObject &json);
diff --git a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/commander_spellbook_estimate_bracket_result.cpp b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/commander_spellbook_estimate_bracket_result.cpp
index 35ba954a1..c3640ce79 100644
--- a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/commander_spellbook_estimate_bracket_result.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/commander_spellbook_estimate_bracket_result.cpp
@@ -1,9 +1,5 @@
 #include "commander_spellbook_estimate_bracket_result.h"
 
-#include <QJsonArray>
-#include <QJsonValue>
-#include <QJsonValueRef>
-
 EstimateBracketResult EstimateBracketResult::fromJson(const QJsonObject &json)
 {
     EstimateBracketResult result;
diff --git a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/commander_spellbook_estimate_bracket_result.h b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/commander_spellbook_estimate_bracket_result.h
index c9c152d35..bb589a901 100644
--- a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/commander_spellbook_estimate_bracket_result.h
+++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/commander_spellbook_estimate_bracket_result.h
@@ -6,7 +6,6 @@
 
 #include <QJsonObject>
 #include <QList>
-#include <QString>
 
 struct EstimateBracketResult
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/commander_spellbook_variant_result.cpp b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/commander_spellbook_variant_result.cpp
index 53630a69e..bbc23e15e 100644
--- a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/commander_spellbook_variant_result.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/commander_spellbook_variant_result.cpp
@@ -1,7 +1,5 @@
 #include "commander_spellbook_variant_result.h"
 
-#include <QJsonValue>
-
 CommanderSpellbookVariantResult CommanderSpellbookVariantResult::fromJson(const QJsonObject &json)
 {
     CommanderSpellbookVariantResult result;
diff --git a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/commander_spellbook_variant_result.h b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/commander_spellbook_variant_result.h
index 49f45f92c..d908f1299 100644
--- a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/commander_spellbook_variant_result.h
+++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/commander_spellbook_variant_result.h
@@ -3,7 +3,6 @@
 
 #include <QJsonArray>
 #include <QJsonObject>
-#include <QString>
 
 struct CommanderSpellbookVariantResult
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_service.cpp b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_service.cpp
index 8e0448faa..b85129a3f 100644
--- a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_service.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_service.cpp
@@ -4,8 +4,6 @@
 
 #include <libcockatrice/settings/commander_bracket_settings.h>
 
-class DeckList;
-
 CommanderBracketService &CommanderBracketService::instance()
 {
     static CommanderBracketService service;
diff --git a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_service.h b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_service.h
index 22962cc95..e0c2a9d55 100644
--- a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_service.h
+++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_service.h
@@ -1,15 +1,10 @@
 #ifndef COCKATRICE_COMMANDER_BRACKET_SERVICE_H
 #define COCKATRICE_COMMANDER_BRACKET_SERVICE_H
 
-#include "api_response/commander_spellbook_estimate_bracket_result.h"
 #include "commander_spellbook_api_accessor.h"
+#include "libcockatrice/deck_list/deck_list.h"
 
 #include <QObject>
-#include <QString>
-#include <QtGlobal>
-#include <qtmetamacros.h>
-
-class DeckList;
 
 struct CommanderBracketEstimate
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_widget.cpp
index 06a76dd19..2cbbedfa4 100644
--- a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_widget.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_widget.cpp
@@ -3,9 +3,7 @@
 #include "../../../../../client/settings/cache_settings.h"
 #include "../../../../pixel_map_generator.h"
 #include "commander_bracket_service.h"
-#include "libcockatrice/deck_list/deck_list.h"
 
-#include <QAbstractButton>
 #include <QComboBox>
 #include <QDialog>
 #include <QDialogButtonBox>
@@ -13,17 +11,11 @@
 #include <QGridLayout>
 #include <QHBoxLayout>
 #include <QLabel>
-#include <QList>
-#include <QObject>
 #include <QPushButton>
-#include <QStringLiteral>
 #include <QTimer>
 #include <QToolButton>
 #include <QVBoxLayout>
 #include <libcockatrice/settings/deck_editor_settings.h>
-#include <qnamespace.h>
-
-template <class T> class QSharedPointer;
 
 CommanderBracketWidget::CommanderBracketWidget(QWidget *parent) : QWidget(parent)
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_widget.h b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_widget.h
index f5b2b7958..a45610fcf 100644
--- a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_widget.h
+++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_widget.h
@@ -4,17 +4,12 @@
 #include "commander_spellbook_bracket_explainer.h"
 
 #include <QSharedPointer>
-#include <QString>
 #include <QWidget>
-#include <QtGlobal>
-#include <qtmetamacros.h>
+#include <libcockatrice/deck_list/deck_list.h>
 
 class QLabel;
 class QToolButton;
 struct CommanderBracketEstimate;
-class DeckList;
-class QObject;
-template <class T> class QSharedPointer;
 
 class CommanderBracketWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_spellbook_api_accessor.cpp b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_spellbook_api_accessor.cpp
index bd8d9379d..590692d98 100644
--- a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_spellbook_api_accessor.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_spellbook_api_accessor.cpp
@@ -1,21 +1,13 @@
 #include "commander_spellbook_api_accessor.h"
 
 #include "api_response/commander_spellbook_deck_request.h"
-#include "api_response/commander_spellbook_estimate_bracket_result.h"
 
-#include <QByteArray>
 #include <QJsonDocument>
 #include <QJsonObject>
-#include <QJsonParseError>
-#include <QNetworkReply>
 #include <QNetworkRequest>
-#include <QStringLiteral>
 #include <QUrl>
-#include <QVariant>
 #include <version_string.h>
 
-class DeckList;
-
 static const QUrl ESTIMATE_BRACKET_URL(QStringLiteral("https://backend.commanderspellbook.com/estimate-bracket"));
 
 CommanderSpellbookApiAccessor &CommanderSpellbookApiAccessor::instance()
diff --git a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_spellbook_api_accessor.h b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_spellbook_api_accessor.h
index 98e7e3710..682a48524 100644
--- a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_spellbook_api_accessor.h
+++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_spellbook_api_accessor.h
@@ -1,15 +1,12 @@
 #ifndef COCKATRICE_COMMANDER_SPELLBOOK_API_ACCESSOR_H
 #define COCKATRICE_COMMANDER_SPELLBOOK_API_ACCESSOR_H
 
-#include <QNetworkAccessManager>
-#include <QObject>
-#include <QString>
-#include <QtGlobal>
-#include <qtmetamacros.h>
+#include "api_response/commander_spellbook_estimate_bracket_result.h"
 
-class DeckList;
-class QNetworkReply;
-struct EstimateBracketResult;
+#include <QNetworkAccessManager>
+#include <QNetworkReply>
+#include <QObject>
+#include <libcockatrice/deck_list/deck_list.h>
 
 class CommanderSpellbookApiAccessor final : public QObject
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_spellbook_bracket_explainer.cpp b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_spellbook_bracket_explainer.cpp
index 06250f1ea..fc308ed60 100644
--- a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_spellbook_bracket_explainer.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_spellbook_bracket_explainer.cpp
@@ -1,9 +1,5 @@
 #include "commander_spellbook_bracket_explainer.h"
 
-#include "api_response/commander_spellbook_card_result.h"
-#include "api_response/commander_spellbook_estimate_bracket_result.h"
-#include "api_response/commander_spellbook_variant_result.h"
-
 static QString cardList(const QList<CommanderSpellbookCardResult> &cards, int max = 5)
 {
     QStringList names;
diff --git a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_spellbook_bracket_explainer.h b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_spellbook_bracket_explainer.h
index 3ab317df9..9ed499742 100644
--- a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_spellbook_bracket_explainer.h
+++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_spellbook_bracket_explainer.h
@@ -1,12 +1,6 @@
 #ifndef COCKATRICE_COMMANDER_SPELLBOOK_BRACKET_EXPLAINER_H
 #define COCKATRICE_COMMANDER_SPELLBOOK_BRACKET_EXPLAINER_H
-
-#include <QList>
-#include <QString>
-#include <QStringList>
-#include <QtGlobal>
-
-struct EstimateBracketResult;
+#include "api_response/commander_spellbook_estimate_bracket_result.h"
 
 namespace CommanderBracketNames
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/handle_commander_brackets.cpp b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/handle_commander_brackets.cpp
index 22200ffa2..90b490efe 100644
--- a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/handle_commander_brackets.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/handle_commander_brackets.cpp
@@ -2,16 +2,9 @@
 
 #include "../../../../../client/settings/cache_settings.h"
 
-#include <QByteArray>
 #include <QJsonDocument>
-#include <QJsonParseError>
-#include <QMap>
-#include <QNetworkAccessManager>
-#include <QNetworkRequest>
-#include <QString>
-#include <QStringLiteral>
+#include <QJsonObject>
 #include <QUrl>
-#include <QVariant>
 #include <libcockatrice/settings/commander_bracket_settings.h>
 
 static const QUrl COMMANDER_BRACKET_JSON_URL(QStringLiteral("https://cockatrice.github.io/commander-brackets.json"));
diff --git a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/handle_commander_brackets.h b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/handle_commander_brackets.h
index 39bddba05..b8348b13c 100644
--- a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/handle_commander_brackets.h
+++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/handle_commander_brackets.h
@@ -1,12 +1,9 @@
 #ifndef COCKATRICE_HANDLE_COMMANDER_BRACKETS_H
 #define COCKATRICE_HANDLE_COMMANDER_BRACKETS_H
 
+#include <QNetworkAccessManager>
 #include <QNetworkReply>
 #include <QObject>
-#include <QVariantMap>
-#include <qtmetamacros.h>
-
-class QNetworkAccessManager;
 
 class HandleCommanderBrackets : public QObject
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/archidekt_links/edhrec_api_response_archidekt_links.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/archidekt_links/edhrec_api_response_archidekt_links.cpp
index 411fdd5ed..145a3fca0 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/archidekt_links/edhrec_api_response_archidekt_links.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/archidekt_links/edhrec_api_response_archidekt_links.cpp
@@ -3,9 +3,6 @@
 #include <QDebug>
 #include <QJsonArray>
 #include <QJsonObject>
-#include <QJsonValue>
-#include <QJsonValueConstRef>
-#include <qlogging.h>
 
 void EdhrecApiResponseArchidektLink::fromJson(const QJsonObject &json)
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/archidekt_links/edhrec_api_response_archidekt_links.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/archidekt_links/edhrec_api_response_archidekt_links.h
index 0786550fe..d265c164d 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/archidekt_links/edhrec_api_response_archidekt_links.h
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/archidekt_links/edhrec_api_response_archidekt_links.h
@@ -1,9 +1,7 @@
 #ifndef ARCHIDEKTENTRY_H
 #define ARCHIDEKTENTRY_H
 
-#include <QJsonArray>
 #include <QJsonObject>
-#include <QList>
 #include <QString>
 #include <QVector>
 
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_average_deck_api_response.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_average_deck_api_response.cpp
index b6ecac0af..1297fc157 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_average_deck_api_response.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_average_deck_api_response.cpp
@@ -1,13 +1,7 @@
 #include "edhrec_average_deck_api_response.h"
 
-#include "../archidekt_links/edhrec_api_response_archidekt_links.h"
-#include "../cards/edhrec_api_response_card_container.h"
-#include "../commander/edhrec_commander_api_response_average_deck_statistics.h"
-
 #include <QDebug>
 #include <QJsonArray>
-#include <QJsonValue>
-#include <qlogging.h>
 
 void EdhrecAverageDeckApiResponse::fromJson(const QJsonObject &json)
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.cpp
index 324dce52a..1cb070c30 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.cpp
@@ -1,14 +1,10 @@
 #include "edhrec_deck_api_response.h"
 
+#include <QApplication>
 #include <QDebug>
 #include <QJsonArray>
-#include <QJsonValue>
-#include <QJsonValueConstRef>
-#include <QString>
-#include <QTextStream>
-#include <functional>
+#include <QJsonObject>
 #include <libcockatrice/card/import/card_name_normalizer.h>
-#include <qlogging.h>
 
 void EdhrecDeckApiResponse::fromJson(const QJsonArray &json)
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.h
index a47fcc10b..7bc97c431 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.h
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.h
@@ -7,9 +7,7 @@
 #ifndef EDHREC_DECK_API_RESPONSE_H
 #define EDHREC_DECK_API_RESPONSE_H
 
-#include "libcockatrice/deck_list/deck_list.h"
-
-#include <QJsonArray>
+#include "../../../../../../deck_loader/deck_loader.h"
 
 class EdhrecDeckApiResponse
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/card_prices/edhrec_api_response_card_prices.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/card_prices/edhrec_api_response_card_prices.cpp
index 26502f1de..1231d147a 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/card_prices/edhrec_api_response_card_prices.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/card_prices/edhrec_api_response_card_prices.cpp
@@ -1,8 +1,6 @@
 #include "edhrec_api_response_card_prices.h"
 
 #include <QDebug>
-#include <QJsonValue>
-#include <qlogging.h>
 
 void CardPrices::fromJson(const QJsonObject &json)
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_container.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_container.cpp
index 8660cac50..3fef8be34 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_container.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_container.cpp
@@ -3,9 +3,6 @@
 #include <QDebug>
 #include <QJsonArray>
 #include <QJsonObject>
-#include <QJsonValue>
-#include <QJsonValueRef>
-#include <qlogging.h>
 
 void EdhrecApiResponseCardContainer::fromJson(const QJsonObject &json)
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_container.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_container.h
index 70d39474d..d76dda490 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_container.h
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_container.h
@@ -11,7 +11,6 @@
 #include "edhrec_commander_api_response_commander_details.h"
 
 #include <QJsonObject>
-#include <QList>
 #include <QString>
 #include <QVector>
 
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_details.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_details.cpp
index ebf09d2a9..a4a746c61 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_details.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_details.cpp
@@ -1,8 +1,6 @@
 #include "edhrec_api_response_card_details.h"
 
 #include <QDebug>
-#include <QJsonValue>
-#include <qlogging.h>
 
 EdhrecApiResponseCardDetails::EdhrecApiResponseCardDetails()
     : synergy(0.0), inclusion(0), numDecks(0), potentialDecks(0)
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_list.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_list.cpp
index 0cf585ee9..72d6fe2cc 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_list.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_list.cpp
@@ -1,10 +1,6 @@
 #include "edhrec_api_response_card_list.h"
 
 #include <QDebug>
-#include <QJsonArray>
-#include <QJsonValue>
-#include <QJsonValueRef>
-#include <qlogging.h>
 
 EdhrecApiResponseCardList::EdhrecApiResponseCardList()
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_list.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_list.h
index d6e0d7f75..2df29de0c 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_list.h
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_list.h
@@ -9,7 +9,7 @@
 
 #include "edhrec_api_response_card_details.h"
 
-#include <QJsonObject>
+#include <QJsonArray>
 #include <QList>
 #include <QString>
 
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_commander_api_response_commander_details.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_commander_api_response_commander_details.cpp
index 7383677c8..7b220603e 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_commander_api_response_commander_details.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_commander_api_response_commander_details.cpp
@@ -1,11 +1,6 @@
 #include "edhrec_commander_api_response_commander_details.h"
 
-#include "../card_prices/edhrec_api_response_card_prices.h"
-
 #include <QDebug>
-#include <QJsonValue>
-#include <QJsonValueRef>
-#include <qlogging.h>
 
 void EdhrecCommanderApiResponseCommanderDetails::fromJson(const QJsonObject &json)
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_commander_api_response_commander_details.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_commander_api_response_commander_details.h
index a0858e9d2..293e9a150 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_commander_api_response_commander_details.h
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_commander_api_response_commander_details.h
@@ -10,8 +10,6 @@
 #include "../card_prices/edhrec_api_response_card_prices.h"
 
 #include <QJsonArray>
-#include <QJsonObject>
-#include <QList>
 #include <QString>
 #include <QVector>
 
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response.cpp
index 1e0304e8a..da2a9c052 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response.cpp
@@ -1,12 +1,7 @@
 #include "edhrec_commander_api_response.h"
 
-#include "../archidekt_links/edhrec_api_response_archidekt_links.h"
-#include "../cards/edhrec_api_response_card_container.h"
-
 #include <QDebug>
 #include <QJsonArray>
-#include <QJsonValue>
-#include <qlogging.h>
 
 void EdhrecCommanderApiResponse::fromJson(const QJsonObject &json)
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response_average_deck_statistics.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response_average_deck_statistics.cpp
index 996ec3c0c..74cce5322 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response_average_deck_statistics.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response_average_deck_statistics.cpp
@@ -1,7 +1,5 @@
 #include "edhrec_commander_api_response_average_deck_statistics.h"
 
-#include <QJsonValue>
-
 void EdhrecCommanderApiResponseAverageDeckStatistics::fromJson(const QJsonObject &json)
 {
     creature = json.value("creature").toInt(0);
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_cards/edhrec_top_cards_api_response.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_cards/edhrec_top_cards_api_response.cpp
index 4df2f3523..26122ce89 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_cards/edhrec_top_cards_api_response.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_cards/edhrec_top_cards_api_response.cpp
@@ -1,10 +1,7 @@
 #include "edhrec_top_cards_api_response.h"
 
-#include "../cards/edhrec_api_response_card_container.h"
-
 #include <QDebug>
-#include <QJsonValue>
-#include <qlogging.h>
+#include <QJsonArray>
 
 void EdhrecTopCardsApiResponse::fromJson(const QJsonObject &json)
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_cards/edhrec_top_cards_api_response.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_cards/edhrec_top_cards_api_response.h
index cdf0d4a71..695498e2b 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_cards/edhrec_top_cards_api_response.h
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_cards/edhrec_top_cards_api_response.h
@@ -9,7 +9,6 @@
 
 #include "../cards/edhrec_api_response_card_container.h"
 
-#include <QJsonObject>
 #include <QString>
 
 class EdhrecTopCardsApiResponse
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_commanders/edhrec_top_commanders_api_response.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_commanders/edhrec_top_commanders_api_response.cpp
index c1bf71cb2..83b10c9e5 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_commanders/edhrec_top_commanders_api_response.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_commanders/edhrec_top_commanders_api_response.cpp
@@ -1,10 +1,7 @@
 #include "edhrec_top_commanders_api_response.h"
 
-#include "../cards/edhrec_api_response_card_container.h"
-
 #include <QDebug>
-#include <QJsonValue>
-#include <qlogging.h>
+#include <QJsonArray>
 
 void EdhrecTopCommandersApiResponse::fromJson(const QJsonObject &json)
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_commanders/edhrec_top_commanders_api_response.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_commanders/edhrec_top_commanders_api_response.h
index 4579632c6..10aa51ff4 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_commanders/edhrec_top_commanders_api_response.h
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_commanders/edhrec_top_commanders_api_response.h
@@ -9,7 +9,6 @@
 
 #include "../cards/edhrec_api_response_card_container.h"
 
-#include <QJsonObject>
 #include <QString>
 
 class EdhrecTopCommandersApiResponse
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_tags/edhrec_top_tags_api_response.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_tags/edhrec_top_tags_api_response.cpp
index cf6ea5df8..56eb4fa4f 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_tags/edhrec_top_tags_api_response.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_tags/edhrec_top_tags_api_response.cpp
@@ -1,10 +1,7 @@
 #include "edhrec_top_tags_api_response.h"
 
-#include "../cards/edhrec_api_response_card_container.h"
-
 #include <QDebug>
-#include <QJsonValue>
-#include <qlogging.h>
+#include <QJsonArray>
 
 void EdhrecTopTagsApiResponse::fromJson(const QJsonObject &json)
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_tags/edhrec_top_tags_api_response.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_tags/edhrec_top_tags_api_response.h
index e6e25d97b..0337d94f8 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_tags/edhrec_top_tags_api_response.h
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_tags/edhrec_top_tags_api_response.h
@@ -9,7 +9,6 @@
 
 #include "../cards/edhrec_api_response_card_container.h"
 
-#include <QJsonObject>
 #include <QString>
 
 class EdhrecTopTagsApiResponse
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp
index 0ba74fd60..75902daad 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp
@@ -1,13 +1,5 @@
 #include "edhrec_api_response_card_prices_display_widget.h"
 
-#include "../../api_response/card_prices/edhrec_api_response_card_prices.h"
-
-#include <QGridLayout>
-#include <QJsonObject>
-#include <QJsonValue>
-#include <QLabel>
-#include <QString>
-
 EdhrecApiResponseCardPricesDisplayWidget::EdhrecApiResponseCardPricesDisplayWidget(QWidget *parent,
                                                                                    const CardPrices &_cardPrices)
     : QWidget(parent), cardPrices(_cardPrices)
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.h
index 75fe033dc..8943ae9f3 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.h
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.h
@@ -9,11 +9,9 @@
 
 #include "../../api_response/card_prices/edhrec_api_response_card_prices.h"
 
+#include <QGridLayout>
+#include <QLabel>
 #include <QWidget>
-#include <qtmetamacros.h>
-
-class QGridLayout;
-class QLabel;
 
 class EdhrecApiResponseCardPricesDisplayWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.cpp
index 0728b3154..00c1741df 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.cpp
@@ -1,21 +1,10 @@
 #include "edhrec_api_response_card_details_display_widget.h"
 
-#include "../../../../../cards/card_info_picture_widget.h"
-#include "../../../../../cards/card_size_widget.h"
 #include "../../../../../general/display/background_plate_widget.h"
-#include "../../api_response/cards/edhrec_api_response_card_details.h"
 #include "../../tab_edhrec_main.h"
-#include "edhrec_api_response_card_inclusion_display_widget.h"
-#include "edhrec_api_response_card_synergy_display_widget.h"
-#include "libcockatrice/card/database/card_database_querier.h"
 
-#include <QLabel>
 #include <QMouseEvent>
-#include <QObject>
-#include <QSlider>
-#include <QVBoxLayout>
 #include <libcockatrice/card/database/card_database_manager.h>
-#include <qnamespace.h>
 
 EdhrecApiResponseCardDetailsDisplayWidget::EdhrecApiResponseCardDetailsDisplayWidget(
     QWidget *parent,
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.h
index d738f4685..b09cc4e04 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.h
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.h
@@ -7,18 +7,15 @@
 #ifndef EDHREC_COMMANDER_API_RESPONSE_CARD_DETAILS_DISPLAY_WIDGET_H
 #define EDHREC_COMMANDER_API_RESPONSE_CARD_DETAILS_DISPLAY_WIDGET_H
 
+#include "../../../../../cards/card_info_picture_widget.h"
+#include "../../../../../general/display/background_plate_widget.h"
 #include "../../api_response/cards/edhrec_api_response_card_details.h"
+#include "edhrec_api_response_card_inclusion_display_widget.h"
+#include "edhrec_api_response_card_synergy_display_widget.h"
 
-#include <QString>
+#include <QHBoxLayout>
+#include <QLabel>
 #include <QWidget>
-#include <qtmetamacros.h>
-
-class BackgroundPlateWidget;
-class CardInfoPictureWidget;
-class EdhrecApiResponseCardInclusionDisplayWidget;
-class EdhrecApiResponseCardSynergyDisplayWidget;
-class QLabel;
-class QVBoxLayout;
 
 class EdhrecApiResponseCardDetailsDisplayWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp
index 6786b006e..8292b00ea 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp
@@ -1,13 +1,5 @@
 #include "edhrec_api_response_card_inclusion_display_widget.h"
 
-#include "../../../../../general/display/charts/bars/percent_bar_widget.h"
-#include "../../api_response/cards/edhrec_api_response_card_details.h"
-
-#include <QLabel>
-#include <QString>
-#include <QVBoxLayout>
-#include <qnamespace.h>
-
 EdhrecApiResponseCardInclusionDisplayWidget::EdhrecApiResponseCardInclusionDisplayWidget(
     QWidget *parent,
     const EdhrecApiResponseCardDetails &_toDisplay)
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.h
index 61a1bd645..516d820eb 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.h
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.h
@@ -7,14 +7,12 @@
 #ifndef EDHREC_API_RESPONSE_CARD_INCLUSION_DISPLAY_WIDGET_H
 #define EDHREC_API_RESPONSE_CARD_INCLUSION_DISPLAY_WIDGET_H
 
+#include "../../../../../general/display/charts/bars/percent_bar_widget.h"
 #include "../../api_response/cards/edhrec_api_response_card_details.h"
 
+#include <QLabel>
+#include <QVBoxLayout>
 #include <QWidget>
-#include <qtmetamacros.h>
-
-class PercentBarWidget;
-class QLabel;
-class QVBoxLayout;
 
 class EdhrecApiResponseCardInclusionDisplayWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.cpp
index 5295b92d5..841ef315b 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.cpp
@@ -1,19 +1,9 @@
 #include "edhrec_api_response_card_list_display_widget.h"
 
 #include "../../../../../general/display/banner_widget.h"
-#include "../../../../../general/layout_containers/flow_widget.h"
-#include "../../api_response/cards/edhrec_api_response_card_details.h"
-#include "../../api_response/cards/edhrec_api_response_card_list.h"
 #include "edhrec_api_response_card_details_display_widget.h"
 
-#include <QDebug>
-#include <QForeach>
-#include <QList>
-#include <QResizeEvent>
-#include <QSize>
-#include <QVBoxLayout>
-#include <qlogging.h>
-#include <qnamespace.h>
+#include <QLabel>
 
 EdhrecApiResponseCardListDisplayWidget::EdhrecApiResponseCardListDisplayWidget(QWidget *parent,
                                                                                EdhrecApiResponseCardList toDisplay)
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.h
index 20bdad8ea..555da6ecf 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.h
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.h
@@ -8,14 +8,12 @@
 #define EDHREC_COMMANDER_API_RESPONSE_CARD_LIST_DISPLAY_WIDGET_H
 
 #include "../../../../../general/display/banner_widget.h"
+#include "../../../../../general/layout_containers/flow_widget.h"
+#include "../../api_response/cards/edhrec_api_response_card_list.h"
 
-#include <QString>
+#include <QResizeEvent>
+#include <QVBoxLayout>
 #include <QWidget>
-#include <qtmetamacros.h>
-
-class EdhrecApiResponseCardList;
-class FlowWidget;
-class QVBoxLayout;
 
 class EdhrecApiResponseCardListDisplayWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp
index 5f4b02327..9d5571a8f 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp
@@ -1,13 +1,5 @@
 #include "edhrec_api_response_card_synergy_display_widget.h"
 
-#include "../../../../../general/display/charts/bars/percent_bar_widget.h"
-#include "../../api_response/cards/edhrec_api_response_card_details.h"
-
-#include <QLabel>
-#include <QString>
-#include <QVBoxLayout>
-#include <qnamespace.h>
-
 EdhrecApiResponseCardSynergyDisplayWidget::EdhrecApiResponseCardSynergyDisplayWidget(
     QWidget *parent,
     const EdhrecApiResponseCardDetails &_toDisplay)
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.h
index 71cca6ca4..5800b5497 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.h
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.h
@@ -7,14 +7,12 @@
 #ifndef EDHREC_API_RESPONSE_CARD_SYNERGY_DISPLAY_WIDGET_H
 #define EDHREC_API_RESPONSE_CARD_SYNERGY_DISPLAY_WIDGET_H
 
+#include "../../../../../general/display/charts/bars/percent_bar_widget.h"
 #include "../../api_response/cards/edhrec_api_response_card_details.h"
 
+#include <QLabel>
+#include <QVBoxLayout>
 #include <QWidget>
-#include <qtmetamacros.h>
-
-class PercentBarWidget;
-class QLabel;
-class QVBoxLayout;
 
 class EdhrecApiResponseCardSynergyDisplayWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp
index 3da050edd..40a803e77 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp
@@ -1,20 +1,11 @@
 #include "edhrec_api_response_commander_details_display_widget.h"
 
 #include "../../../../../cards/card_info_picture_widget.h"
-#include "../../../../../cards/card_size_widget.h"
-#include "../../api_response/cards/edhrec_commander_api_response_commander_details.h"
 #include "../../tab_edhrec_main.h"
 #include "../card_prices/edhrec_api_response_card_prices_display_widget.h"
-#include "edhrec_commander_api_response_navigation_widget.h"
-#include "libcockatrice/card/database/card_database_querier.h"
+#include "edhrec_commander_api_response_bracket_navigation_widget.h"
 
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QObject>
-#include <QSlider>
-#include <QVBoxLayout>
 #include <libcockatrice/card/database/card_database_manager.h>
-#include <qnamespace.h>
 
 EdhrecCommanderResponseCommanderDetailsDisplayWidget::EdhrecCommanderResponseCommanderDetailsDisplayWidget(
     QWidget *parent,
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.h
index 197263512..4201ce3b3 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.h
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.h
@@ -7,19 +7,16 @@
 #ifndef EDHREC_COMMANDER_API_RESPONSE_COMMANDER_DETAILS_DISPLAY_WIDGET_H
 #define EDHREC_COMMANDER_API_RESPONSE_COMMANDER_DETAILS_DISPLAY_WIDGET_H
 
+#include "../../../../../cards/card_info_picture_widget.h"
 #include "../../api_response/cards/edhrec_commander_api_response_commander_details.h"
+#include "../card_prices/edhrec_api_response_card_prices_display_widget.h"
+#include "edhrec_commander_api_response_navigation_widget.h"
 
-#include <QString>
+#include <QLabel>
+#include <QVBoxLayout>
 #include <QWidget>
-#include <qtmetamacros.h>
 
 class EdhrecCommanderApiResponseNavigationWidget;
-class CardInfoPictureWidget;
-class EdhrecApiResponseCardPricesDisplayWidget;
-class QHBoxLayout;
-class QLabel;
-class QVBoxLayout;
-
 class EdhrecCommanderResponseCommanderDetailsDisplayWidget : public QWidget
 {
     Q_OBJECT
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.cpp
index b26a7e574..c3ab23e41 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.cpp
@@ -1,12 +1,6 @@
 #include "edhrec_commander_api_response_bracket_navigation_widget.h"
 
-#include <QChar>
-#include <QGridLayout>
-#include <QLabel>
-#include <QPushButton>
 #include <QSet>
-#include <QSharedPointer>
-#include <qnamespace.h>
 
 EdhrecCommanderApiResponseBracketNavigationWidget::EdhrecCommanderApiResponseBracketNavigationWidget(
     QWidget *parent,
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.h
index a741b6696..713ef2791 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.h
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.h
@@ -1,16 +1,11 @@
 #ifndef COCKATRICE_EDHREC_COMMANDER_API_RESPONSE_BRACKET_NAVIGATION_WIDGET_H
 #define COCKATRICE_EDHREC_COMMANDER_API_RESPONSE_BRACKET_NAVIGATION_WIDGET_H
 
-#include <QList>
+#include <QGridLayout>
+#include <QLabel>
 #include <QMap>
-#include <QString>
-#include <QStringList>
+#include <QPushButton>
 #include <QWidget>
-#include <qtmetamacros.h>
-
-class QGridLayout;
-class QLabel;
-class QPushButton;
 
 class EdhrecCommanderApiResponseBracketNavigationWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.cpp
index 48704d010..1845c020d 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.cpp
@@ -1,12 +1,6 @@
 #include "edhrec_commander_api_response_budget_navigation_widget.h"
 
-#include <QChar>
-#include <QGridLayout>
-#include <QLabel>
-#include <QPushButton>
 #include <QSet>
-#include <QSharedPointer>
-#include <qnamespace.h>
 
 EdhrecCommanderApiResponseBudgetNavigationWidget::EdhrecCommanderApiResponseBudgetNavigationWidget(
     QWidget *parent,
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.h
index 8013d1d6b..666edba16 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.h
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.h
@@ -1,16 +1,11 @@
 #ifndef COCKATRICE_EDHREC_COMMANDER_API_RESPONSE_BUDGET_NAVIGATION_WIDGET_H
 #define COCKATRICE_EDHREC_COMMANDER_API_RESPONSE_BUDGET_NAVIGATION_WIDGET_H
 
-#include <QList>
+#include <QGridLayout>
+#include <QLabel>
 #include <QMap>
-#include <QString>
-#include <QStringList>
+#include <QPushButton>
 #include <QWidget>
-#include <qtmetamacros.h>
-
-class QGridLayout;
-class QLabel;
-class QPushButton;
 
 class EdhrecCommanderApiResponseBudgetNavigationWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.cpp
index 111d91b91..230858d6c 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.cpp
@@ -1,30 +1,15 @@
 #include "edhrec_commander_api_response_display_widget.h"
 
-#include "../../api_response/cards/edhrec_api_response_card_container.h"
-#include "../../api_response/cards/edhrec_api_response_card_list.h"
+#include "../../../../../cards/card_info_picture_widget.h"
 #include "../../api_response/commander/edhrec_commander_api_response.h"
 #include "../cards/edhrec_api_response_card_list_display_widget.h"
 #include "edhrec_api_response_commander_details_display_widget.h"
 
-#include <QAbstractItemView>
-#include <QDebug>
-#include <QHBoxLayout>
-#include <QLayoutItem>
-#include <QList>
 #include <QListView>
-#include <QModelIndex>
-#include <QObject>
 #include <QResizeEvent>
 #include <QScrollArea>
-#include <QSize>
 #include <QSplitter>
-#include <QStringList>
 #include <QStringListModel>
-#include <QVBoxLayout>
-#include <qlogging.h>
-#include <qnamespace.h>
-
-class QModelIndex;
 
 EdhrecCommanderApiResponseDisplayWidget::EdhrecCommanderApiResponseDisplayWidget(QWidget *parent,
                                                                                  EdhrecCommanderApiResponse response,
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.h
index 5ada40df3..80da8a7f8 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.h
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.h
@@ -7,14 +7,11 @@
 #ifndef EDHREC_COMMANDER_API_RESPONSE_DISPLAY_WIDGET_H
 #define EDHREC_COMMANDER_API_RESPONSE_DISPLAY_WIDGET_H
 
-#include <QString>
-#include <QWidget>
-#include <qtmetamacros.h>
+#include "../../api_response/commander/edhrec_commander_api_response.h"
 
-class EdhrecCommanderApiResponse;
-class QHBoxLayout;
-class QScrollArea;
-class QVBoxLayout;
+#include <QScrollArea>
+#include <QVBoxLayout>
+#include <QWidget>
 
 class EdhrecCommanderApiResponseDisplayWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp
index fd02c4261..c42d2ed90 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp
@@ -1,12 +1,6 @@
 #include "edhrec_commander_api_response_navigation_widget.h"
 
 #include "../../tab_edhrec_main.h"
-#include "edhrec_commander_api_response_bracket_navigation_widget.h"
-#include "edhrec_commander_api_response_budget_navigation_widget.h"
-
-#include <QGridLayout>
-#include <QObject>
-#include <QPushButton>
 
 EdhrecCommanderApiResponseNavigationWidget::EdhrecCommanderApiResponseNavigationWidget(
     QWidget *parent,
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.h
index 737558625..9b46b54ba 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.h
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.h
@@ -7,16 +7,14 @@
 #ifndef EDHREC_COMMANDER_API_RESPONSE_NAVIGATION_WIDGET_H
 #define EDHREC_COMMANDER_API_RESPONSE_NAVIGATION_WIDGET_H
 
-#include "../../api_response/cards/edhrec_commander_api_response_commander_details.h"
+#include "edhrec_api_response_commander_details_display_widget.h"
+#include "edhrec_commander_api_response_bracket_navigation_widget.h"
+#include "edhrec_commander_api_response_budget_navigation_widget.h"
 
-#include <QString>
+#include <QGridLayout>
+#include <QLabel>
+#include <QPushButton>
 #include <QWidget>
-#include <qtmetamacros.h>
-
-class EdhrecCommanderApiResponseBracketNavigationWidget;
-class EdhrecCommanderApiResponseBudgetNavigationWidget;
-class QGridLayout;
-class QPushButton;
 
 class EdhrecCommanderApiResponseNavigationWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.cpp
index 6f32db102..ae07c9dc8 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.cpp
@@ -1,17 +1,8 @@
 #include "edhrec_top_cards_api_response_display_widget.h"
 
-#include "../../api_response/cards/edhrec_api_response_card_container.h"
-#include "../../api_response/cards/edhrec_api_response_card_list.h"
 #include "../../api_response/top_cards/edhrec_top_cards_api_response.h"
 #include "../cards/edhrec_api_response_card_list_display_widget.h"
 
-#include <QHBoxLayout>
-#include <QList>
-#include <QResizeEvent>
-#include <QScrollArea>
-#include <QVBoxLayout>
-#include <qnamespace.h>
-
 EdhrecTopCardsApiResponseDisplayWidget::EdhrecTopCardsApiResponseDisplayWidget(QWidget *parent,
                                                                                EdhrecTopCardsApiResponse response)
     : QWidget(parent)
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.h
index 8b5ddfad0..30998391c 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.h
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.h
@@ -7,13 +7,12 @@
 #ifndef EDHREC_TOP_CARDS_API_RESPONSE_DISPLAY_WIDGET_H
 #define EDHREC_TOP_CARDS_API_RESPONSE_DISPLAY_WIDGET_H
 
-#include <QWidget>
-#include <qtmetamacros.h>
+#include "../../api_response/top_cards/edhrec_top_cards_api_response.h"
 
-class EdhrecTopCardsApiResponse;
-class QHBoxLayout;
-class QScrollArea;
-class QVBoxLayout;
+#include <QResizeEvent>
+#include <QScrollArea>
+#include <QVBoxLayout>
+#include <QWidget>
 
 class EdhrecTopCardsApiResponseDisplayWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.cpp
index 4ab333fd4..13f54a979 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.cpp
@@ -1,20 +1,8 @@
 #include "edhrec_top_commanders_api_response_display_widget.h"
 
-#include "../../api_response/cards/edhrec_api_response_card_container.h"
-#include "../../api_response/cards/edhrec_api_response_card_list.h"
 #include "../../api_response/top_commanders/edhrec_top_commanders_api_response.h"
 #include "../cards/edhrec_api_response_card_list_display_widget.h"
 
-#include <QDebug>
-#include <QHBoxLayout>
-#include <QList>
-#include <QResizeEvent>
-#include <QScrollArea>
-#include <QSize>
-#include <QVBoxLayout>
-#include <qlogging.h>
-#include <qnamespace.h>
-
 EdhrecTopCommandersApiResponseDisplayWidget::EdhrecTopCommandersApiResponseDisplayWidget(
     QWidget *parent,
     EdhrecTopCommandersApiResponse response)
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.h
index 8471a8dda..2b9563ea5 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.h
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.h
@@ -7,13 +7,12 @@
 #ifndef EDHREC_TOP_COMMANDERS_API_RESPONSE_DISPLAY_WIDGET_H
 #define EDHREC_TOP_COMMANDERS_API_RESPONSE_DISPLAY_WIDGET_H
 
-#include <QWidget>
-#include <qtmetamacros.h>
+#include "../../api_response/top_commanders/edhrec_top_commanders_api_response.h"
 
-class EdhrecTopCommandersApiResponse;
-class QHBoxLayout;
-class QScrollArea;
-class QVBoxLayout;
+#include <QResizeEvent>
+#include <QScrollArea>
+#include <QVBoxLayout>
+#include <QWidget>
 
 class EdhrecTopCommandersApiResponseDisplayWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.cpp
index 9c7ce8d06..91a1ce3fa 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.cpp
@@ -1,17 +1,8 @@
 #include "edhrec_top_tags_api_response_display_widget.h"
 
-#include "../../api_response/cards/edhrec_api_response_card_container.h"
-#include "../../api_response/cards/edhrec_api_response_card_list.h"
 #include "../../api_response/top_tags/edhrec_top_tags_api_response.h"
 #include "../cards/edhrec_api_response_card_list_display_widget.h"
 
-#include <QHBoxLayout>
-#include <QList>
-#include <QResizeEvent>
-#include <QScrollArea>
-#include <QVBoxLayout>
-#include <qnamespace.h>
-
 EdhrecTopTagsApiResponseDisplayWidget::EdhrecTopTagsApiResponseDisplayWidget(QWidget *parent,
                                                                              EdhrecTopTagsApiResponse response)
     : QWidget(parent)
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.h
index 2c13d069f..4a4fc8991 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.h
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.h
@@ -7,13 +7,11 @@
 #ifndef EDHREC_TOP_TAGS_API_RESPONSE_DISPLAY_WIDGET_H
 #define EDHREC_TOP_TAGS_API_RESPONSE_DISPLAY_WIDGET_H
 
-#include <QWidget>
-#include <qtmetamacros.h>
+#include "../../api_response/top_tags/edhrec_top_tags_api_response.h"
 
-class EdhrecTopTagsApiResponse;
-class QHBoxLayout;
-class QScrollArea;
-class QVBoxLayout;
+#include <QScrollArea>
+#include <QVBoxLayout>
+#include <QWidget>
 
 class EdhrecTopTagsApiResponseDisplayWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec.cpp
index 3aa395126..10389f4eb 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec.cpp
@@ -1,26 +1,16 @@
 #include "tab_edhrec.h"
 
-#include "../../tab.h"
 #include "api_response/commander/edhrec_commander_api_response.h"
 #include "display/commander/edhrec_commander_api_response_display_widget.h"
-#include "libcockatrice/card/card_info.h"
 
-#include <QByteArray>
-#include <QChar>
 #include <QDebug>
 #include <QJsonArray>
 #include <QJsonDocument>
 #include <QJsonObject>
-#include <QJsonValueRef>
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
-#include <QNetworkRequest>
 #include <QRegularExpression>
-#include <QSharedPointer>
-#include <QUrl>
-#include <qlogging.h>
-
-class TabSupervisor;
+#include <QResizeEvent>
 
 TabEdhRec::TabEdhRec(TabSupervisor *_tabSupervisor) : Tab(_tabSupervisor)
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec.h
index 4e3c9c8ba..5ce36c9cf 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec.h
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec.h
@@ -8,16 +8,10 @@
 #define TAB_EDHREC_H
 
 #include "../../tab.h"
+#include "display/commander/edhrec_commander_api_response_display_widget.h"
 
-#include <QJsonValue>
-#include <QString>
+#include <QNetworkAccessManager>
 #include <libcockatrice/card/card_info.h>
-#include <qtmetamacros.h>
-
-class EdhrecCommanderApiResponseDisplayWidget;
-class QNetworkAccessManager;
-class QNetworkReply;
-class TabSupervisor;
 
 class TabEdhRec : public Tab
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp
index ca575dc02..500eab13a 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp
@@ -1,9 +1,6 @@
 #include "tab_edhrec_main.h"
 
 #include "../../../../../client/settings/cache_settings.h"
-#include "../../../../deck_loader/loaded_deck.h"
-#include "../../../cards/card_size_widget.h"
-#include "../../../quick_settings/settings_button_widget.h"
 #include "../../../utility/completer_utils.h"
 #include "../../tab_supervisor.h"
 #include "api_response/average_deck/edhrec_average_deck_api_response.h"
@@ -21,17 +18,13 @@
 #include <QJsonArray>
 #include <QJsonDocument>
 #include <QJsonObject>
-#include <QLineEdit>
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
 #include <QPushButton>
 #include <QRegularExpression>
 #include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/card/database/card_database_querier.h>
 #include <libcockatrice/models/database/card/card_completer_proxy_model.h>
 #include <libcockatrice/models/database/card/card_search_model.h>
-#include <libcockatrice/models/database/card_database_display_model.h>
-#include <libcockatrice/models/database/card_database_model.h>
 #include <libcockatrice/settings/cards_display_settings.h>
 #include <version_string.h>
 
@@ -141,8 +134,6 @@ void TabEdhRecMain::setCard(CardInfoPtr _cardToQuery, bool isCommander)
         return;
     }
 
-    emit tabTextChanged(this, getTabText());
-
     QString cardName = cardToQuery->getName();
     QString formattedName = cardName.toLower().replace(" ", "-").remove(QRegularExpression("[^a-z0-9\\-]"));
 
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h
index 5d0245ed4..a7ed83efd 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h
@@ -7,25 +7,16 @@
 #ifndef TAB_EDHREC_MAIN_H
 #define TAB_EDHREC_MAIN_H
 
+#include "../../interface/widgets/cards/card_size_widget.h"
+#include "../../interface/widgets/quick_settings/settings_button_widget.h"
 #include "../../tab.h"
-#include "libcockatrice/card/card_info.h"
+#include "display/commander/edhrec_commander_api_response_display_widget.h"
 
-#include <QJsonObject>
-#include <QJsonValue>
-#include <QString>
-#include <qtmetamacros.h>
-
-class CardSizeWidget;
-class EdhrecCommanderApiResponseDisplayWidget;
-class QHBoxLayout;
-class QLineEdit;
-class QNetworkAccessManager;
-class QNetworkReply;
-class QPushButton;
-class QVBoxLayout;
-class QWidget;
-class SettingsButtonWidget;
-class TabSupervisor;
+#include <QHBoxLayout>
+#include <QLineEdit>
+#include <QNetworkAccessManager>
+#include <QPushButton>
+#include <libcockatrice/card/database/card_database.h>
 
 class TabEdhRecMain : public Tab
 {
diff --git a/cockatrice/src/interface/widgets/tabs/tab.cpp b/cockatrice/src/interface/widgets/tabs/tab.cpp
index 5ef4d18b8..3dcb3b523 100644
--- a/cockatrice/src/interface/widgets/tabs/tab.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab.cpp
@@ -1,17 +1,12 @@
 #include "tab.h"
 
 #include "../interface/widgets/cards/card_info_display_widget.h"
-#include "libcockatrice/utility/card_ref.h"
 #include "tab_supervisor.h"
 
 #include <QApplication>
-#include <QFlags>
-#include <QPoint>
-#include <QRect>
+#include <QCloseEvent>
+#include <QDebug>
 #include <QScreen>
-#include <QSharedPointer>
-#include <QtGlobal>
-#include <qnamespace.h>
 
 Tab::Tab(TabSupervisor *_tabSupervisor)
     : QMainWindow(_tabSupervisor), tabSupervisor(_tabSupervisor), contentsChanged(false), infoPopup(0)
diff --git a/cockatrice/src/interface/widgets/tabs/tab.h b/cockatrice/src/interface/widgets/tabs/tab.h
index e114f9bd9..bddf325e2 100644
--- a/cockatrice/src/interface/widgets/tabs/tab.h
+++ b/cockatrice/src/interface/widgets/tabs/tab.h
@@ -7,16 +7,12 @@
 #ifndef TAB_H
 #define TAB_H
 
-#include <QList>
 #include <QMainWindow>
-#include <QString>
 #include <libcockatrice/utility/card_ref.h>
-#include <qtmetamacros.h>
 
 class QMenu;
 class TabSupervisor;
 class CardInfoDisplayWidget;
-class QPoint;
 
 class Tab : public QMainWindow
 {
diff --git a/cockatrice/src/interface/widgets/tabs/tab_account.cpp b/cockatrice/src/interface/widgets/tabs/tab_account.cpp
index e55dc55d0..dbcf50966 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_account.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_account.cpp
@@ -6,17 +6,10 @@
 #include "../interface/widgets/server/user/user_list_manager.h"
 #include "../interface/widgets/server/user/user_list_widget.h"
 #include "../interface/widgets/utility/custom_line_edit.h"
-#include "libcockatrice/protocol/pb/response.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_user.pb.h"
 #include "tab_supervisor.h"
 
-#include <QHBoxLayout>
-#include <QList>
-#include <QMap>
 #include <QPushButton>
-#include <QSharedPointer>
 #include <QVBoxLayout>
-#include <QWidget>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/event_add_to_list.pb.h>
 #include <libcockatrice/protocol/pb/event_remove_from_list.pb.h>
@@ -26,7 +19,6 @@
 #include <libcockatrice/protocol/pb/session_commands.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
 #include <libcockatrice/utility/string_limits.h>
-#include <qnamespace.h>
 
 TabAccount::TabAccount(TabSupervisor *_tabSupervisor, AbstractClient *_client, const ServerInfo_User &userInfo)
     : Tab(_tabSupervisor), client(_client)
diff --git a/cockatrice/src/interface/widgets/tabs/tab_account.h b/cockatrice/src/interface/widgets/tabs/tab_account.h
index ab2c4b38d..68054c7a1 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_account.h
+++ b/cockatrice/src/interface/widgets/tabs/tab_account.h
@@ -9,16 +9,11 @@
 
 #include "tab.h"
 
-#include <QString>
-#include <qtmetamacros.h>
-#include <string>
-// IWYU pragma: keep
-// ServerInfo_User appears by value and inside QList in slot signatures, so the
-// moc-generated code needs the complete type.
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
 
 class AbstractClient;
 class Event_AddToList;
+class Event_ListRooms;
 class Event_RemoveFromList;
 class Event_UserJoined;
 class Event_UserLeft;
@@ -28,8 +23,6 @@ class Response;
 class ServerInfo_User;
 class UserInfoBox;
 class UserListWidget;
-class TabSupervisor;
-template <typename T> class QList;
 
 class TabAccount : public Tab
 {
diff --git a/cockatrice/src/interface/widgets/tabs/tab_admin.cpp b/cockatrice/src/interface/widgets/tabs/tab_admin.cpp
index cfbd00538..16f17e03e 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_admin.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_admin.cpp
@@ -1,31 +1,19 @@
 #include "tab_admin.h"
 
-#include "libcockatrice/protocol/pb/response.pb.h"
-
 #include <QDialogButtonBox>
 #include <QGridLayout>
 #include <QGroupBox>
-#include <QIntValidator>
 #include <QLabel>
 #include <QLineEdit>
 #include <QMessageBox>
 #include <QPushButton>
 #include <QSpinBox>
-#include <QVBoxLayout>
-#include <QWidget>
-#include <QtGlobal>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/admin_commands.pb.h>
 #include <libcockatrice/protocol/pb/event_replay_added.pb.h>
 #include <libcockatrice/protocol/pb/moderator_commands.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
 #include <libcockatrice/utility/string_limits.h>
-#include <limits.h>
-#include <string>
-
-class CommandContainer;
-class QVariant;
-class TabSupervisor;
 
 ShutdownDialog::ShutdownDialog(QWidget *parent) : QDialog(parent)
 {
diff --git a/cockatrice/src/interface/widgets/tabs/tab_admin.h b/cockatrice/src/interface/widgets/tabs/tab_admin.h
index 8eb139a8e..0da098ba5 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_admin.h
+++ b/cockatrice/src/interface/widgets/tabs/tab_admin.h
@@ -10,17 +10,15 @@
 #include "tab.h"
 
 #include <QDialog>
-#include <QString>
-#include <qtmetamacros.h>
+#include <libcockatrice/protocol/pb/commands.pb.h>
+#include <libcockatrice/protocol/pb/response.pb.h>
 
 class AbstractClient;
+
 class QGroupBox;
 class QPushButton;
 class QSpinBox;
 class QLineEdit;
-class QWidget;
-class Response;
-class TabSupervisor;
 
 class ShutdownDialog : public QDialog
 {
diff --git a/cockatrice/src/interface/widgets/tabs/tab_card_art_rules.cpp b/cockatrice/src/interface/widgets/tabs/tab_card_art_rules.cpp
index 1fc2854ce..999bc3db0 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_card_art_rules.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_card_art_rules.cpp
@@ -1,39 +1,16 @@
 #include "tab_card_art_rules.h"
 
 #include "../utility/completer_utils.h"
-#include "card_database_display_model.h"
-#include "card_database_model.h"
-#include "libcockatrice/card/card_info.h"
 #include "libcockatrice/card/database/card_database_manager.h"
-#include "libcockatrice/card/database/card_database_querier.h"
-#include "libcockatrice/card/printing/exact_card.h"
-#include "libcockatrice/card/printing/printing_info.h"
-#include "libcockatrice/card/set/card_set.h"
-#include "libcockatrice/protocol/pb/response.pb.h"
 
-#include <QAbstractItemView>
-#include <QComboBox>
 #include <QCompleter>
 #include <QFormLayout>
 #include <QHBoxLayout>
-#include <QLineEdit>
-#include <QList>
-#include <QPushButton>
-#include <QSharedPointer>
-#include <QTableView>
 #include <QVBoxLayout>
-#include <QVariant>
-#include <QWidget>
-#include <QtGlobal>
-#include <google/protobuf/repeated_ptr_field.h>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/moderator_commands.pb.h>
 #include <libcockatrice/protocol/pb/response_card_art_rule_entry.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
-#include <string>
-
-class QObject;
-class TabSupervisor;
 
 CardArtRulesModel::CardArtRulesModel(AbstractClient *client, QObject *parent)
     : QAbstractTableModel(parent), client(client)
diff --git a/cockatrice/src/interface/widgets/tabs/tab_card_art_rules.h b/cockatrice/src/interface/widgets/tabs/tab_card_art_rules.h
index f34300179..b9ea2ca83 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_card_art_rules.h
+++ b/cockatrice/src/interface/widgets/tabs/tab_card_art_rules.h
@@ -1,28 +1,16 @@
 #ifndef COCKATRICE_DLG_CARD_ART_RULES_H
 #define COCKATRICE_DLG_CARD_ART_RULES_H
 
-#include "tab.h"
+#include "card/card_search_model.h"
+#include "tab_supervisor.h"
 
 #include <QAbstractTableModel>
-#include <QModelIndex>
-#include <QString>
-#include <qnamespace.h>
-#include <qtmetamacros.h>
-#include <vector>
+#include <QComboBox>
+#include <QLineEdit>
+#include <QPushButton>
+#include <QTableView>
 
 class AbstractClient;
-class CardCompleterProxyModel;
-class CardDatabaseDisplayModel;
-class CardDatabaseModel;
-class CardSearchModel;
-class QComboBox;
-class QCompleter;
-class QLineEdit;
-class QObject;
-class QPushButton;
-class QTableView;
-class Response;
-class TabSupervisor;
 
 class CardArtRulesModel : public QAbstractTableModel
 {
diff --git a/cockatrice/src/interface/widgets/tabs/tab_deck_editor.cpp b/cockatrice/src/interface/widgets/tabs/tab_deck_editor.cpp
index 7ca179cea..8439aef70 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_deck_editor.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_deck_editor.cpp
@@ -2,28 +2,28 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../../client/settings/shortcuts_settings.h"
-#include "../deck_editor/deck_editor_card_database_dock_widget.h"
-#include "../deck_editor/deck_editor_card_info_dock_widget.h"
-#include "../deck_editor/deck_editor_deck_dock_widget.h"
-#include "../deck_editor/deck_editor_printing_selector_dock_widget.h"
 #include "../deck_editor/deck_state_manager.h"
+#include "../filters/filter_builder.h"
+#include "../interface/pixel_map_generator.h"
+#include "../interface/widgets/cards/card_info_frame_widget.h"
 #include "../interface/widgets/deck_editor/deck_editor_filter_dock_widget.h"
 #include "../interface/widgets/menus/deck_editor_menu.h"
+#include "tab_supervisor.h"
 
 #include <QAction>
-#include <QByteArray>
+#include <QCloseEvent>
+#include <QDebug>
+#include <QDir>
 #include <QDockWidget>
-#include <QEvent>
-#include <QList>
-#include <QMap>
-#include <QMenu>
-#include <QSize>
-#include <QString>
+#include <QHeaderView>
+#include <QMenuBar>
+#include <QProcessEnvironment>
+#include <QTimer>
+#include <libcockatrice/models/database/card_database_model.h>
+#include <libcockatrice/network/client/abstract/abstract_client.h>
+#include <libcockatrice/protocol/pending_command.h>
 #include <libcockatrice/settings/cards_display_settings.h>
 #include <libcockatrice/settings/layouts_settings.h>
-#include <qnamespace.h>
-
-class TabSupervisor;
 
 /**
  * @brief Constructs a new TabDeckEditor object.
diff --git a/cockatrice/src/interface/widgets/tabs/tab_deck_editor.h b/cockatrice/src/interface/widgets/tabs/tab_deck_editor.h
index afe62e962..14be59cd7 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_deck_editor.h
+++ b/cockatrice/src/interface/widgets/tabs/tab_deck_editor.h
@@ -1,11 +1,17 @@
 #ifndef WINDOW_DECKEDITOR_H
 #define WINDOW_DECKEDITOR_H
 
+#include "../../key_signals.h"
+#include "../interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h"
 #include "abstract_tab_deck_editor.h"
 
-#include <qtmetamacros.h>
+#include <libcockatrice/card/card_info.h>
 
-class TabSupervisor;
+class CardDatabaseModel;
+class CardDatabaseDisplayModel;
+class DeckListModel;
+
+class QLabel;
 
 /**
  * @class TabDeckEditor
diff --git a/cockatrice/src/interface/widgets/tabs/tab_deck_storage.cpp b/cockatrice/src/interface/widgets/tabs/tab_deck_storage.cpp
index 44d04bd24..41ebb17a2 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_deck_storage.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_deck_storage.cpp
@@ -1,55 +1,32 @@
 #include "tab_deck_storage.h"
 
 #include "../../../client/settings/cache_settings.h"
-#include "../../deck_loader/deck_file_format.h"
 #include "../../deck_loader/deck_loader.h"
-#include "../../deck_loader/loaded_deck.h"
 #include "../../pixel_map_generator.h"
 #include "../cards/additional_info/deck_color_identity.h"
 #include "../deck_share/deck_share_utils.h"
 #include "../deck_share/share_bar_widget.h"
 #include "../interface/widgets/server/remote/remote_decklist_tree_widget.h"
 #include "../interface/widgets/utility/get_text_with_max.h"
-#include "abstract_client.h"
-#include "libcockatrice/protocol/pb/commands.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_user.pb.h"
-#include "libcockatrice/protocol/pb/session_commands.pb.h"
 
-#include <QAbstractItemModel>
-#include <QAbstractItemView>
 #include <QAction>
 #include <QApplication>
+#include <QDateTime>
 #include <QDebug>
 #include <QDesktopServices>
 #include <QDir>
-#include <QFile>
-#include <QFileInfo>
 #include <QFileSystemModel>
-#include <QGridLayout>
 #include <QGroupBox>
 #include <QHBoxLayout>
 #include <QHeaderView>
 #include <QInputDialog>
-#include <QItemSelection>
-#include <QItemSelectionModel>
 #include <QLineEdit>
 #include <QMessageBox>
-#include <QModelIndex>
-#include <QModelIndexList>
-#include <QPixmap>
-#include <QSharedPointer>
-#include <QSize>
-#include <QSizePolicy>
-#include <QStringLiteral>
-#include <QStyle>
 #include <QTimer>
 #include <QToolBar>
 #include <QTreeView>
 #include <QUrl>
 #include <QVBoxLayout>
-#include <QWidget>
-#include <QtGlobal>
-#include <algorithm>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/deck_list/deck_list.h>
 #include <libcockatrice/protocol/pb/command_deck_del.pb.h>
@@ -61,17 +38,12 @@
 #include <libcockatrice/protocol/pb/command_deck_upload.pb.h>
 #include <libcockatrice/protocol/pb/response.pb.h>
 #include <libcockatrice/protocol/pb/response_deck_download.pb.h>
+#include <libcockatrice/protocol/pb/response_deck_share_create.pb.h>
 #include <libcockatrice/protocol/pb/response_deck_upload.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
 #include <libcockatrice/settings/network_settings.h>
 #include <libcockatrice/settings/paths_settings.h>
 #include <libcockatrice/utility/string_limits.h>
-#include <optional>
-#include <qlogging.h>
-#include <qnamespace.h>
-#include <string>
-
-class TabSupervisor;
 
 namespace
 {
diff --git a/cockatrice/src/interface/widgets/tabs/tab_deck_storage.h b/cockatrice/src/interface/widgets/tabs/tab_deck_storage.h
index 35a4649c7..f8d585880 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_deck_storage.h
+++ b/cockatrice/src/interface/widgets/tabs/tab_deck_storage.h
@@ -11,26 +11,22 @@
 #include "../interface/widgets/server/remote/remote_decklist_tree_widget.h"
 #include "tab.h"
 
-#include <QList>
-#include <QString>
 #include <QStringList>
-#include <QVariant>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
-#include <qtmetamacros.h>
 
 struct LoadedDeck;
 class ServerInfo_User;
+class AbstractClient;
 class QTreeView;
 class QFileSystemModel;
 class QToolBar;
+class QTreeWidget;
+class QTreeWidgetItem;
 class QGroupBox;
 class QTimer;
 class CommandContainer;
 class Response;
 class ShareBarWidget;
-class QAction;
-class QModelIndex;
-class TabSupervisor;
 
 class TabDeckStorage : public Tab
 {
diff --git a/cockatrice/src/interface/widgets/tabs/tab_developer.cpp b/cockatrice/src/interface/widgets/tabs/tab_developer.cpp
index d641a1ea5..39652ef7d 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_developer.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_developer.cpp
@@ -6,35 +6,21 @@
 
 #include "tab_developer.h"
 
-#include "libcockatrice/protocol/pb/response.pb.h"
-
-#include <QAbstractItemView>
 #include <QCheckBox>
 #include <QDateTime>
-#include <QFont>
 #include <QHBoxLayout>
 #include <QHeaderView>
 #include <QLabel>
-#include <QList>
 #include <QPushButton>
-#include <QSharedPointer>
-#include <QSizePolicy>
 #include <QSpinBox>
 #include <QTableWidget>
-#include <QTableWidgetItem>
 #include <QTimer>
 #include <QVBoxLayout>
-#include <QWidget>
-#include <QtGlobal>
 #include <algorithm>
-#include <google/protobuf/repeated_ptr_field.h>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/command_get_server_stats.pb.h>
 #include <libcockatrice/protocol/pb/response_get_server_stats.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
-#include <qnamespace.h>
-
-class TabSupervisor;
 
 static constexpr int DEFAULT_AUTO_REFRESH_INTERVAL_SECS = 30;
 
diff --git a/cockatrice/src/interface/widgets/tabs/tab_developer.h b/cockatrice/src/interface/widgets/tabs/tab_developer.h
index 1a4e5904f..727a56bcb 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_developer.h
+++ b/cockatrice/src/interface/widgets/tabs/tab_developer.h
@@ -9,10 +9,6 @@
 
 #include "tab.h"
 
-#include <QString>
-#include <QtGlobal>
-#include <qtmetamacros.h>
-
 class AbstractClient;
 class QCheckBox;
 class QLabel;
@@ -21,7 +17,6 @@ class QSpinBox;
 class QTableWidget;
 class QTimer;
 class Response;
-class TabSupervisor;
 
 class TabDeveloper : public Tab
 {
diff --git a/cockatrice/src/interface/widgets/tabs/tab_game.cpp b/cockatrice/src/interface/widgets/tabs/tab_game.cpp
index 4cf5919ba..23976340b 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_game.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_game.cpp
@@ -2,16 +2,11 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../../client/settings/shortcuts_settings.h"
-#include "../../../game/abstract_game.h"
-#include "../../../game/game_event_handler.h"
-#include "../../../game/game_meta_info.h"
-#include "../../../game/game_state.h"
-#include "../../../game/player/player_info.h"
-#include "../../../game/player/player_manager.h"
-#include "../../../game_graphics/board/abstract_card_item.h"
 #include "../game/game.h"
 #include "../game/player/player_logic.h"
 #include "../game/replay.h"
+#include "../game_graphics/board/arrow_item.h"
+#include "../game_graphics/board/card_item.h"
 #include "../game_graphics/deckview/deck_view_container.h"
 #include "../game_graphics/deckview/tabbed_deck_view_container.h"
 #include "../game_graphics/game_scene.h"
@@ -30,48 +25,37 @@
 #include "../interface/widgets/server/user/user_list_manager.h"
 #include "../interface/widgets/utility/completer_utils.h"
 #include "../interface/widgets/utility/line_edit_completer.h"
+#include "../interface/window_main.h"
 #include "../main.h"
-#include "../menus/tearoff_menu.h"
-#include "../replay/replay_widget.h"
 #include "../utility/visibility_change_listener.h"
 #include "card/card_completer_proxy_model.h"
 #include "card/card_search_model.h"
 #include "card_database_display_model.h"
 #include "card_database_model.h"
-#include "libcockatrice/card/database/card_database_querier.h"
-#include "libcockatrice/card/printing/exact_card.h"
-#include "libcockatrice/deck_list/deck_list.h"
-#include "libcockatrice/protocol/pb/serverinfo_game.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_playerproperties.pb.h"
-#include "libcockatrice/utility/card_ref.h"
 #include "tab_supervisor.h"
 
 #include <QAction>
 #include <QApplication>
 #include <QClipboard>
-#include <QCloseEvent>
 #include <QCompleter>
 #include <QDebug>
 #include <QDockWidget>
-#include <QFlags>
 #include <QHBoxLayout>
 #include <QLabel>
-#include <QMapIterator>
 #include <QMenu>
 #include <QMessageBox>
-#include <QPoint>
 #include <QPushButton>
 #include <QRegularExpression>
-#include <QSharedPointer>
 #include <QStackedWidget>
 #include <QStringListModel>
-#include <QSystemTrayIcon>
 #include <QTimer>
 #include <QVBoxLayout>
 #include <QWidget>
-#include <QtGlobal>
+#include <libcockatrice/card/database/card_database.h>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
+#include <libcockatrice/protocol/pb/event_game_joined.pb.h>
+#include <libcockatrice/protocol/pb/game_replay.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_player.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
 #include <libcockatrice/settings/chat_settings.h>
@@ -79,18 +63,6 @@
 #include <libcockatrice/settings/interface_settings.h>
 #include <libcockatrice/settings/layouts_settings.h>
 #include <libcockatrice/utility/string_limits.h>
-#include <qnamespace.h>
-#include <qobjectdefs.h>
-#include <utility>
-
-class Event_GameJoined;
-namespace google
-{
-namespace protobuf
-{
-class Message;
-} // namespace protobuf
-} // namespace google
 
 TabGame::TabGame(TabSupervisor *_tabSupervisor, GameReplay *_replay)
     : Tab(_tabSupervisor), sayLabel(nullptr), sayEdit(nullptr)
@@ -1060,12 +1032,6 @@ void TabGame::setCardMenu(CardMenu *menu)
         return;
     }
 
-    if (aCardMenu->menu() && aCardMenu->menu()->isVisible()) {
-        aCardMenu->menu()->hide();
-        if (gameView && gameView->viewport()) {
-            gameView->viewport()->update();
-        }
-    }
     if (menu) {
         aCardMenu->setMenu(menu);
     } else {
diff --git a/cockatrice/src/interface/widgets/tabs/tab_game.h b/cockatrice/src/interface/widgets/tabs/tab_game.h
index 7bc52202f..29a2f40a3 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_game.h
+++ b/cockatrice/src/interface/widgets/tabs/tab_game.h
@@ -9,55 +9,47 @@
 #ifndef TAB_GAME_H
 #define TAB_GAME_H
 
+#include "../game/abstract_game.h"
+#include "../game/player/player_logic.h"
+#include "../game_graphics/log/message_log_widget.h"
+#include "../interface/widgets/menus/tearoff_menu.h"
+#include "../interface/widgets/replay/replay_widget.h"
 #include "tab.h"
 
-#include <QList>
+#include <QCompleter>
 #include <QLoggingCategory>
 #include <QMap>
-#include <QPair>
-#include <QSize>
-#include <QString>
-#include <QStringList>
-#include <QVector>
-#include <qtmetamacros.h>
-// IWYU pragma: keep
-// ServerInfo_User appears by value and inside QList in slot signatures, so the
-// moc-generated code needs the complete type.
-#include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
+#include <QStringListModel>
 
 class CardMenu;
+class ServerInfo_PlayerProperties;
 class TabbedDeckViewContainer;
-class AbstractGame;
-class Event_GameJoined;
-class GameEventContext;
-class MessageLogWidget;
-class PlayerLogic;
-class QAction;
-class QCompleter;
-class QStringListModel;
-class QWidget;
-class ServerInfo_Player;
-class ServerInfo_User;
-class TabSupervisor;
-class TearOffMenu;
-struct CardRef;
-struct LoadedDeck;
-
 inline Q_LOGGING_CATEGORY(TabGameLog, "tab_game");
 
 class UserListProxy;
+class DeckViewContainer;
 class AbstractClient;
+class CardDatabase;
 class GameView;
 class GameScene;
 class ReplayWidget;
 class CardInfoFrameWidget;
+class QTimer;
+class QSplitter;
 class QLabel;
 class QPushButton;
+class QToolButton;
 class QMenu;
+class ZoneViewLayout;
+class ZoneViewWidget;
 class PhasesToolbar;
 class PlayerListWidget;
+class ReplayTimelineWidget;
+class CardZone;
 class AbstractCardItem;
+class CardItem;
 class QVBoxLayout;
+class QHBoxLayout;
 class GameReplay;
 class LineEditCompleter;
 class QDockWidget;
diff --git a/cockatrice/src/interface/widgets/tabs/tab_home.cpp b/cockatrice/src/interface/widgets/tabs/tab_home.cpp
index 1358645d0..7a79b1785 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_home.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_home.cpp
@@ -1,9 +1,5 @@
 #include "tab_home.h"
 
-#include "../general/home_widget.h"
-
-class TabSupervisor;
-
 TabHome::TabHome(TabSupervisor *_tabSupervisor, AbstractClient *_client) : Tab(_tabSupervisor), client(_client)
 {
     homeWidget = new HomeWidget(this, tabSupervisor);
diff --git a/cockatrice/src/interface/widgets/tabs/tab_home.h b/cockatrice/src/interface/widgets/tabs/tab_home.h
index bc86348cb..3aae19c2b 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_home.h
+++ b/cockatrice/src/interface/widgets/tabs/tab_home.h
@@ -7,14 +7,12 @@
 #ifndef TAB_HOME_H
 #define TAB_HOME_H
 
+#include "../interface/widgets/general/home_widget.h"
 #include "tab.h"
 
-#include <QString>
-#include <qtmetamacros.h>
+#include <libcockatrice/network/client/abstract/abstract_client.h>
 
 class AbstractClient;
-class HomeWidget;
-class TabSupervisor;
 
 class TabHome : public Tab
 {
diff --git a/cockatrice/src/interface/widgets/tabs/tab_logs.cpp b/cockatrice/src/interface/widgets/tabs/tab_logs.cpp
index 9f17afea2..f73d06b57 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_logs.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_logs.cpp
@@ -1,35 +1,23 @@
 #include "tab_logs.h"
 
 #include "../interface/widgets/utility/custom_line_edit.h"
-#include "libcockatrice/protocol/pb/response.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_chat_message.pb.h"
 
 #include <QCheckBox>
 #include <QDockWidget>
 #include <QGridLayout>
 #include <QGroupBox>
 #include <QLabel>
-#include <QList>
 #include <QMessageBox>
 #include <QPushButton>
 #include <QRadioButton>
-#include <QSharedPointer>
-#include <QSizePolicy>
 #include <QSpinBox>
 #include <QTabWidget>
 #include <QTableWidget>
-#include <QTableWidgetItem>
-#include <QVBoxLayout>
-#include <QWidget>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/moderator_commands.pb.h>
 #include <libcockatrice/protocol/pb/response_viewlog_history.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
 #include <libcockatrice/utility/string_limits.h>
-#include <qnamespace.h>
-#include <string>
-
-class TabSupervisor;
 
 TabLog::TabLog(TabSupervisor *_tabSupervisor, AbstractClient *_client, bool _canUseDeveloperCommands)
     : Tab(_tabSupervisor), client(_client), canUseDeveloperCommands(_canUseDeveloperCommands)
diff --git a/cockatrice/src/interface/widgets/tabs/tab_logs.h b/cockatrice/src/interface/widgets/tabs/tab_logs.h
index fc8ef1ea0..8e914ea64 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_logs.h
+++ b/cockatrice/src/interface/widgets/tabs/tab_logs.h
@@ -9,8 +9,7 @@
 
 #include "tab.h"
 
-#include <QString>
-#include <qtmetamacros.h>
+#include <QDialog>
 
 class AbstractClient;
 class LineEditUnfocusable;
@@ -25,8 +24,9 @@ class QWidget;
 class QGridLayout;
 class QVBoxLayout;
 class QTableWidget;
+class CommandContainer;
 class Response;
-class TabSupervisor;
+class AbstractClient;
 
 class TabLog : public Tab
 {
diff --git a/cockatrice/src/interface/widgets/tabs/tab_message.cpp b/cockatrice/src/interface/widgets/tabs/tab_message.cpp
index 65186e396..418843178 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_message.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_message.cpp
@@ -6,18 +6,12 @@
 #include "../interface/widgets/server/user/user_list_manager.h"
 #include "../interface/widgets/utility/custom_line_edit.h"
 #include "../main.h"
-#include "libcockatrice/protocol/pb/response.pb.h"
-#include "tab_supervisor.h"
 
-#include <QAction>
 #include <QApplication>
-#include <QCloseEvent>
+#include <QDebug>
 #include <QMenu>
-#include <QMessageLogger>
-#include <QSharedPointer>
 #include <QSystemTrayIcon>
 #include <QVBoxLayout>
-#include <QWidget>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/event_user_message.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
@@ -25,7 +19,6 @@
 #include <libcockatrice/protocol/pending_command.h>
 #include <libcockatrice/settings/chat_settings.h>
 #include <libcockatrice/utility/string_limits.h>
-#include <string>
 
 TabMessage::TabMessage(TabSupervisor *_tabSupervisor,
                        AbstractClient *_client,
diff --git a/cockatrice/src/interface/widgets/tabs/tab_message.h b/cockatrice/src/interface/widgets/tabs/tab_message.h
index bea58ecb3..0e6d66d4c 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_message.h
+++ b/cockatrice/src/interface/widgets/tabs/tab_message.h
@@ -10,13 +10,6 @@
 #include "tab.h"
 
 #include <QLoggingCategory>
-#include <QString>
-#include <QVariant>
-#include <qtmetamacros.h>
-
-class QAction;
-class QMenu;
-class TabSupervisor;
 
 inline Q_LOGGING_CATEGORY(TabMessageLog, "tab_message");
 
diff --git a/cockatrice/src/interface/widgets/tabs/tab_moderation.cpp b/cockatrice/src/interface/widgets/tabs/tab_moderation.cpp
index 09a640540..b9c37f1af 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_moderation.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_moderation.cpp
@@ -1,13 +1,8 @@
 #include "tab_moderation.h"
 
 #include "abstract_client.h"
-#include "libcockatrice/protocol/pb/admin_commands.pb.h"
-#include "libcockatrice/protocol/pb/response.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_moderator_login.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_user_alt.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_user_session.pb.h"
+#include "tab_supervisor.h"
 
-#include <QAbstractItemView>
 #include <QDateTime>
 #include <QGridLayout>
 #include <QGroupBox>
@@ -15,17 +10,12 @@
 #include <QHeaderView>
 #include <QLabel>
 #include <QLineEdit>
-#include <QList>
 #include <QMessageBox>
 #include <QPushButton>
-#include <QSharedPointer>
 #include <QSplitter>
-#include <QStringList>
 #include <QTableWidget>
-#include <QTableWidgetItem>
 #include <QTextEdit>
 #include <QVBoxLayout>
-#include <QWidget>
 #include <libcockatrice/protocol/pb/command_report_user_info.pb.h>
 #include <libcockatrice/protocol/pb/moderator_commands.pb.h>
 #include <libcockatrice/protocol/pb/response_moderator_last_logins.pb.h>
@@ -36,10 +26,6 @@
 #include <libcockatrice/protocol/pb/response_user_sessions.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
-#include <qnamespace.h>
-#include <string>
-
-class TabSupervisor;
 
 namespace
 {
diff --git a/cockatrice/src/interface/widgets/tabs/tab_moderation.h b/cockatrice/src/interface/widgets/tabs/tab_moderation.h
index e352e90bb..0a534992b 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_moderation.h
+++ b/cockatrice/src/interface/widgets/tabs/tab_moderation.h
@@ -3,9 +3,7 @@
 
 #include "tab.h"
 
-#include <QString>
-#include <QtGlobal>
-#include <qtmetamacros.h>
+#include <libcockatrice/protocol/pb/response.pb.h>
 
 class AbstractClient;
 class QGroupBox;
@@ -14,8 +12,6 @@ class QLineEdit;
 class QPushButton;
 class QTableWidget;
 class QTextEdit;
-class Response;
-class TabSupervisor;
 
 /**
  * Staff investigation tool. Lets moderators look up a user's account data,
diff --git a/cockatrice/src/interface/widgets/tabs/tab_public_decks.cpp b/cockatrice/src/interface/widgets/tabs/tab_public_decks.cpp
index 6bf3f6be7..d13f9d1e3 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_public_decks.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_public_decks.cpp
@@ -2,7 +2,6 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../deck_loader/deck_loader.h"
-#include "../../deck_loader/loaded_deck.h"
 #include "../cards/card_size_widget.h"
 #include "../general/layout_containers/flow_widget.h"
 #include "../visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.h"
@@ -13,21 +12,14 @@
 #include "../visual_deck_storage/visual_deck_storage_tag_filter_widget.h"
 #include "tab_supervisor.h"
 
-#include <QAbstractItemModel>
-#include <QChar>
-#include <QDebug>
-#include <QFont>
+#include <QDateTime>
 #include <QHBoxLayout>
 #include <QLabel>
-#include <QList>
 #include <QMessageBox>
 #include <QPixmap>
-#include <QSet>
 #include <QStringList>
 #include <QToolButton>
 #include <QVBoxLayout>
-#include <QWidget>
-#include <functional>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/command_deck_download_public.pb.h>
 #include <libcockatrice/protocol/pb/response.pb.h>
@@ -35,7 +27,6 @@
 #include <libcockatrice/protocol/pending_command.h>
 #include <libcockatrice/settings/cards_display_settings.h>
 #include <optional>
-#include <qnamespace.h>
 
 TabPublicDecks::TabPublicDecks(TabSupervisor *_tabSupervisor, AbstractClient *_client, const QString &_userName)
     : Tab(_tabSupervisor), client(_client), userName(_userName)
diff --git a/cockatrice/src/interface/widgets/tabs/tab_public_decks.h b/cockatrice/src/interface/widgets/tabs/tab_public_decks.h
index 847479e78..492fdeafa 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_public_decks.h
+++ b/cockatrice/src/interface/widgets/tabs/tab_public_decks.h
@@ -8,13 +8,11 @@
 
 #include "tab.h"
 
-#include <QString>
-#include <qtmetamacros.h>
-
 class AbstractClient;
 class CommandContainer;
 class DeckPreviewColorIdentityFilterWidget;
 class FlowWidget;
+class PublicDeckPreviewWidget;
 class QLabel;
 class QToolButton;
 class RemotePublicDecksModel;
@@ -22,7 +20,6 @@ class Response;
 class VisualDeckStorageQuickSettingsWidget;
 class VisualDeckStorageSearchWidget;
 class VisualDeckStorageTagFilterWidget;
-class TabSupervisor;
 
 /**
  * @brief A visual grid of the public decks published by another user.
diff --git a/cockatrice/src/interface/widgets/tabs/tab_replays.cpp b/cockatrice/src/interface/widgets/tabs/tab_replays.cpp
index 52bc4cd8f..e26bea2a3 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_replays.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_replays.cpp
@@ -3,51 +3,22 @@
 #include "../../../client/settings/cache_settings.h"
 #include "../../pixel_map_generator.h"
 #include "../interface/widgets/server/remote/remote_replay_list_tree_widget.h"
-#include "libcockatrice/protocol/pb/commands.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_replay.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_replay_match.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_user.pb.h"
-#include "libcockatrice/protocol/pb/session_commands.pb.h"
+#include "tab_game.h"
 
-#include <QAbstractItemModel>
-#include <QAbstractItemView>
 #include <QAction>
 #include <QApplication>
-#include <QByteArray>
 #include <QClipboard>
-#include <QDebug>
 #include <QDesktopServices>
 #include <QDir>
-#include <QFile>
-#include <QFileInfo>
 #include <QFileSystemModel>
-#include <QGridLayout>
 #include <QGroupBox>
 #include <QHBoxLayout>
 #include <QHeaderView>
-#include <QIODevice>
 #include <QInputDialog>
-#include <QItemSelectionModel>
-#include <QLineEdit>
-#include <QList>
-#include <QLoggingCategory>
 #include <QMessageBox>
-#include <QMessageLogger>
-#include <QModelIndex>
-#include <QModelIndexList>
-#include <QPushButton>
-#include <QSet>
-#include <QSharedPointer>
-#include <QSize>
-#include <QSizePolicy>
-#include <QStringList>
-#include <QStringLiteral>
-#include <QStyle>
 #include <QToolBar>
 #include <QTreeView>
 #include <QUrl>
-#include <QVBoxLayout>
-#include <QWidget>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/command_replay_delete_match.pb.h>
 #include <libcockatrice/protocol/pb/command_replay_download.pb.h>
@@ -61,11 +32,6 @@
 #include <libcockatrice/protocol/pb/response_replay_get_code.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
 #include <libcockatrice/settings/paths_settings.h>
-#include <qlogging.h>
-#include <qnamespace.h>
-#include <string>
-
-class TabSupervisor;
 
 inline Q_LOGGING_CATEGORY(TabReplaysLog, "replays_tab");
 
diff --git a/cockatrice/src/interface/widgets/tabs/tab_replays.h b/cockatrice/src/interface/widgets/tabs/tab_replays.h
index e29e29bd7..aa4ec039c 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_replays.h
+++ b/cockatrice/src/interface/widgets/tabs/tab_replays.h
@@ -10,26 +10,19 @@
 
 #include "tab.h"
 
-#include <QString>
-#include <QVariant>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
-// IWYU pragma: keep
-// GameReplay is a protobuf message passed through the openReplay signal,
-// so the moc-generated code needs the complete type.
-#include <libcockatrice/protocol/pb/game_replay.pb.h>
-#include <qtmetamacros.h>
 
 class ServerInfo_User;
 class Response;
+class AbstractClient;
 class QTreeView;
 class QFileSystemModel;
+class QToolBar;
 class QGroupBox;
 class RemoteReplayList_TreeWidget;
+class GameReplay;
 class Event_ReplayAdded;
 class CommandContainer;
-class QAction;
-class QModelIndex;
-class TabSupervisor;
 
 class TabReplays : public Tab
 {
diff --git a/cockatrice/src/interface/widgets/tabs/tab_report.cpp b/cockatrice/src/interface/widgets/tabs/tab_report.cpp
index 9018e2477..0b9108f9b 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_report.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_report.cpp
@@ -1,18 +1,12 @@
 #include "tab_report.h"
 
-#include "../server/user/user_context_menu.h"
 #include "../utility/report_utils.h"
 #include "abstract_client.h"
-#include "libcockatrice/protocol/pb/response.pb.h"
 #include "tab_supervisor.h"
 
-#include <QAbstractItemView>
-#include <QChar>
 #include <QCheckBox>
 #include <QComboBox>
 #include <QDateTime>
-#include <QDebug>
-#include <QFont>
 #include <QFontDatabase>
 #include <QGridLayout>
 #include <QGroupBox>
@@ -21,26 +15,21 @@
 #include <QInputDialog>
 #include <QLabel>
 #include <QLineEdit>
+#include <QMessageBox>
 #include <QPushButton>
-#include <QSharedPointer>
 #include <QSignalBlocker>
 #include <QSplitter>
 #include <QTableWidget>
-#include <QTableWidgetItem>
 #include <QTextCursor>
 #include <QTextEdit>
 #include <QTimer>
 #include <QVBoxLayout>
-#include <QVariant>
 #include <QWidget>
-#include <QtGlobal>
-#include <libcockatrice/network/server/remote/user_level.h>
 #include <libcockatrice/protocol/pb/command_replay_download_by_game_id.pb.h>
 #include <libcockatrice/protocol/pb/command_report_add_comment.pb.h>
 #include <libcockatrice/protocol/pb/command_report_assign.pb.h>
 #include <libcockatrice/protocol/pb/command_report_details.pb.h>
 #include <libcockatrice/protocol/pb/command_report_list.pb.h>
-#include <libcockatrice/protocol/pb/command_report_reopen.pb.h>
 #include <libcockatrice/protocol/pb/command_report_resolve.pb.h>
 #include <libcockatrice/protocol/pb/command_report_stats.pb.h>
 #include <libcockatrice/protocol/pb/command_report_user_info.pb.h>
@@ -52,8 +41,6 @@
 #include <libcockatrice/protocol/pb/response_report_user_info.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_report.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
-#include <qnamespace.h>
-#include <string>
 
 namespace
 {
@@ -123,10 +110,6 @@ TabReport::TabReport(TabSupervisor *_tabSupervisor, AbstractClient *_client) : T
     table->horizontalHeader()->setSectionResizeMode(COL_REPORTED, QHeaderView::Stretch);
     table->horizontalHeader()->setSectionResizeMode(COL_REPORTER, QHeaderView::ResizeToContents);
     connect(table, &QTableWidget::itemSelectionChanged, this, &TabReport::onSelectionChanged);
-    table->setContextMenuPolicy(Qt::CustomContextMenu);
-    connect(table, &QTableWidget::customContextMenuRequested, this, &TabReport::showTableContextMenu);
-    userContextMenu = new UserContextMenu(tabSupervisor, this);
-    connect(userContextMenu, &UserContextMenu::openMessageDialog, this, &TabReport::openMessageDialog);
 
     descGroup = new QGroupBox;
     descriptionEdit = new QTextEdit;
@@ -238,14 +221,14 @@ TabReport::TabReport(TabSupervisor *_tabSupervisor, AbstractClient *_client) : T
 
     assignButton = new QPushButton;
     resolveButton = new QPushButton;
+    resolveWithNoteButton = new QPushButton;
     dismissButton = new QPushButton;
-    reopenButton = new QPushButton;
     viewReplayButton = new QPushButton;
     joinGameButton = new QPushButton;
     connect(assignButton, &QPushButton::clicked, this, &TabReport::assignReport);
-    connect(resolveButton, &QPushButton::clicked, this, [this]() { resolveReport(false); });
-    connect(dismissButton, &QPushButton::clicked, this, [this]() { resolveReport(true); });
-    connect(reopenButton, &QPushButton::clicked, this, &TabReport::reopenReport);
+    connect(resolveButton, &QPushButton::clicked, this, [this]() { resolveReport(false, false); });
+    connect(resolveWithNoteButton, &QPushButton::clicked, this, [this]() { resolveReport(false, true); });
+    connect(dismissButton, &QPushButton::clicked, this, [this]() { resolveReport(true, true); });
     connect(viewReplayButton, &QPushButton::clicked, this, &TabReport::viewReplay);
     connect(joinGameButton, &QPushButton::clicked, this, &TabReport::joinGame);
 
@@ -254,8 +237,8 @@ TabReport::TabReport(TabSupervisor *_tabSupervisor, AbstractClient *_client) : T
     auto *actionBar = new QHBoxLayout;
     actionBar->addWidget(assignButton);
     actionBar->addWidget(resolveButton);
+    actionBar->addWidget(resolveWithNoteButton);
     actionBar->addWidget(dismissButton);
-    actionBar->addWidget(reopenButton);
     actionBar->addSpacing(20);
     actionBar->addWidget(viewReplayButton);
     actionBar->addWidget(joinGameButton);
@@ -279,7 +262,6 @@ TabReport::TabReport(TabSupervisor *_tabSupervisor, AbstractClient *_client) : T
 
 void TabReport::retranslateUi()
 {
-    userContextMenu->retranslateUi();
     searchEdit->setPlaceholderText(tr("Search by username, category..."));
     statusFilter->clear();
     statusFilter->addItem(tr("All Statuses"), "");
@@ -320,10 +302,9 @@ void TabReport::retranslateUi()
     statsGroup->setTitle(tr("Report Statistics"));
 
     assignButton->setText(tr("Assign to Me"));
-    resolveButton->setText(tr("Resolve..."));
+    resolveButton->setText(tr("Resolve"));
+    resolveWithNoteButton->setText(tr("Resolve with note..."));
     dismissButton->setText(tr("Dismiss..."));
-    reopenButton->setText(tr("Reopen..."));
-    reopenButton->setToolTip(tr("Available for resolved or dismissed reports."));
     viewReplayButton->setText(tr("View Replay"));
     joinGameButton->setText(tr("Join Game"));
 }
@@ -355,7 +336,6 @@ void TabReport::reportListResponse(const Response &response)
     refreshButton->setEnabled(true);
 
     if (response.response_code() != Response::RespOk) {
-        pendingStatusMessage.clear();
         statusLabel->setText(tr("Failed to load reports."));
         return;
     }
@@ -369,11 +349,6 @@ void TabReport::reportListResponse(const Response &response)
     applyFilters();
     updateStats();
 
-    if (!pendingStatusMessage.isEmpty()) {
-        statusLabel->setText(pendingStatusMessage);
-        pendingStatusMessage.clear();
-    }
-
     if (selectedReportIdBeforeRefresh >= 0) {
         bool found = false;
         for (int row = 0; row < table->rowCount(); ++row) {
@@ -509,36 +484,6 @@ void TabReport::onSelectionChanged()
     updateActionStates();
 }
 
-void TabReport::showTableContextMenu(const QPoint &pos)
-{
-    QTableWidgetItem *clickedItem = table->itemAt(pos);
-    if (!clickedItem || clickedItem->row() < 0) {
-        return;
-    }
-
-    const int row = clickedItem->row();
-    const QTableWidgetItem *reportedItem = table->item(row, COL_REPORTED);
-    const QTableWidgetItem *idItem = table->item(row, COL_ID);
-    if (!reportedItem || !idItem || reportedItem->text().isEmpty()) {
-        return;
-    }
-
-    int userLevel = ServerInfo_User::IsUser;
-    const int reportId = idItem->data(Qt::UserRole).toInt();
-    for (const ServerInfo_Report &r : filteredReports) {
-        if (r.report_id() == reportId) {
-            if (r.reported_user_level() != 0) {
-                userLevel = r.reported_user_level();
-            }
-            break;
-        }
-    }
-
-    table->selectRow(row);
-    userContextMenu->showContextMenu(table->viewport()->mapToGlobal(pos), reportedItem->text(),
-                                     UserLevelFlags(userLevel));
-}
-
 void TabReport::loadReportDetails(int reportId)
 {
     detailsRequestedReportId = reportId;
@@ -622,8 +567,8 @@ void TabReport::updateActionStates()
     const QString status = QString::fromStdString(report.status());
     assignButton->setEnabled(status == "open");
     resolveButton->setEnabled(status == "open" || status == "assigned");
+    resolveWithNoteButton->setEnabled(status == "open" || status == "assigned");
     dismissButton->setEnabled(status == "open" || status == "assigned");
-    reopenButton->setEnabled(status == "resolved" || status == "dismissed");
 
     const bool hasGameId = report.game_id() > 0;
     const bool hasReplay = hasGameId && report.has_replay_id() && report.replay_id() > 0;
@@ -635,8 +580,8 @@ void TabReport::setActionsEnabled(bool enabled)
 {
     assignButton->setEnabled(enabled);
     resolveButton->setEnabled(enabled);
+    resolveWithNoteButton->setEnabled(enabled);
     dismissButton->setEnabled(enabled);
-    reopenButton->setEnabled(enabled);
     viewReplayButton->setEnabled(false);
     joinGameButton->setEnabled(false);
     commentButton->setEnabled(enabled);
@@ -690,7 +635,7 @@ void TabReport::assignReport()
 void TabReport::assignResponse(const Response &response)
 {
     if (response.response_code() == Response::RespOk) {
-        pendingStatusMessage = tr("Assigned.");
+        statusLabel->setText(tr("Assigned."));
         refreshList();
     } else {
         statusLabel->setText(tr("Assignment failed."));
@@ -698,19 +643,22 @@ void TabReport::assignResponse(const Response &response)
     }
 }
 
-void TabReport::resolveReport(bool dismissed)
+void TabReport::resolveReport(bool dismissed, bool promptNote)
 {
     const int reportId = selectedReportId();
     if (reportId < 0) {
         return;
     }
 
-    bool ok;
-    QString note = QInputDialog::getText(this, dismissed ? tr("Dismiss Report") : tr("Resolve Report"),
-                                         dismissed ? tr("Optional note:") : tr("Resolution note (optional):"),
-                                         QLineEdit::Normal, QString(), &ok);
-    if (!ok) {
-        return;
+    QString note;
+    if (promptNote) {
+        bool ok;
+        note = QInputDialog::getText(this, dismissed ? tr("Dismiss Report") : tr("Resolve Report"),
+                                     dismissed ? tr("Optional note:") : tr("Resolution note (optional):"),
+                                     QLineEdit::Normal, QString(), &ok);
+        if (!ok) {
+            return;
+        }
     }
 
     setActionsEnabled(false);
@@ -731,46 +679,7 @@ void TabReport::resolveReport(bool dismissed)
 void TabReport::resolveResponse(const Response &response)
 {
     if (response.response_code() == Response::RespOk) {
-        pendingStatusMessage = tr("Done.");
-        refreshList();
-    } else {
-        statusLabel->setText(tr("Action failed."));
-        updateActionStates();
-    }
-}
-
-void TabReport::reopenReport()
-{
-    const int reportId = selectedReportId();
-    if (reportId < 0) {
-        return;
-    }
-
-    bool ok;
-    QString note = QInputDialog::getText(this, tr("Reopen Report"), tr("Reopening note (optional):"), QLineEdit::Normal,
-                                         QString(), &ok);
-    if (!ok) {
-        return;
-    }
-
-    setActionsEnabled(false);
-    statusLabel->setText(tr("Reopening..."));
-
-    Command_ReportReopen cmd;
-    cmd.set_report_id(reportId);
-    if (!note.isEmpty()) {
-        cmd.set_reopen_note(note.toStdString());
-    }
-
-    PendingCommand *pend = client->prepareModeratorCommand(cmd);
-    connect(pend, &PendingCommand::finished, this, &TabReport::reopenResponse);
-    client->sendCommand(pend);
-}
-
-void TabReport::reopenResponse(const Response &response)
-{
-    if (response.response_code() == Response::RespOk) {
-        pendingStatusMessage = tr("Reopened.");
+        statusLabel->setText(tr("Done."));
         refreshList();
     } else {
         statusLabel->setText(tr("Action failed."));
diff --git a/cockatrice/src/interface/widgets/tabs/tab_report.h b/cockatrice/src/interface/widgets/tabs/tab_report.h
index 32ebe1a3f..b62a99ce2 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_report.h
+++ b/cockatrice/src/interface/widgets/tabs/tab_report.h
@@ -4,10 +4,8 @@
 #include "tab.h"
 
 #include <QList>
-#include <QPoint>
-#include <QString>
+#include <libcockatrice/protocol/pb/response.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_report.pb.h>
-#include <qtmetamacros.h>
 
 class AbstractClient;
 class QCheckBox;
@@ -21,9 +19,6 @@ class QTableWidget;
 class QTextEdit;
 class QTimer;
 class GameReplay;
-class Response;
-class TabSupervisor;
-class UserContextMenu;
 
 class TabReport : public Tab
 {
@@ -39,17 +34,15 @@ public:
 signals:
     void openReplay(GameReplay *replay);
     void requestJoinGame(int gameId, int roomId);
-    void openMessageDialog(const QString &userName, bool focus);
 
 private slots:
     void refreshList();
     void reportListResponse(const Response &response);
     void assignReport();
     void assignResponse(const Response &response);
-    void resolveReport(bool dismissed);
+    void resolveReport(bool dismissed, bool promptNote);
     void resolveResponse(const Response &response);
     void onSelectionChanged();
-    void showTableContextMenu(const QPoint &pos);
     void viewReplay();
     void viewReplayResponse(const Response &response);
     void joinGame();
@@ -60,8 +53,6 @@ private slots:
     void reportDetailsResponse(const Response &response);
     void requestStats();
     void statsResponse(const Response &response);
-    void reopenReport();
-    void reopenResponse(const Response &response);
 
 private:
     int selectedReportId() const;
@@ -91,13 +82,12 @@ private:
     QPushButton *commentButton;
     QPushButton *assignButton;
     QPushButton *resolveButton;
+    QPushButton *resolveWithNoteButton;
     QPushButton *dismissButton;
-    QPushButton *reopenButton;
     QPushButton *viewReplayButton;
     QPushButton *joinGameButton;
     QLabel *statusLabel;
     QTimer *refreshTimer;
-    UserContextMenu *userContextMenu;
 
     QGroupBox *userContextGroup;
     QLabel *userContextName;
@@ -115,7 +105,6 @@ private:
     QLabel *userContextNotesLabel;
     QLabel *userContextRecentReportsLabel;
     QString lastRequestedUser;
-    QString pendingStatusMessage;
     QGroupBox *statsGroup;
     QLabel *statsTotalLabel;
     QLabel *statsTrendLabel;
diff --git a/cockatrice/src/interface/widgets/tabs/tab_room.cpp b/cockatrice/src/interface/widgets/tabs/tab_room.cpp
index 67106ba34..866324367 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_room.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_room.cpp
@@ -11,39 +11,27 @@
 #include "../interface/widgets/server/user/user_list_panel_widget.h"
 #include "../interface/widgets/server/user/user_list_widget.h"
 #include "../main.h"
-#include "../server/game_type_map.h"
-#include "../server/user/user_list_proxy.h"
 #include "../utility/completer_utils.h"
-#include "../utility/line_edit_completer.h"
 #include "card/card_completer_proxy_model.h"
 #include "card/card_search_model.h"
 #include "card_database_display_model.h"
 #include "card_database_model.h"
-#include "libcockatrice/protocol/pb/response.pb.h"
-#include "libcockatrice/protocol/pb/room_event.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_gametype.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_user.pb.h"
+#include "tab_account.h"
 #include "tab_supervisor.h"
-#include "user_level.h"
 
-#include <QAction>
 #include <QApplication>
-#include <QCloseEvent>
 #include <QCompleter>
-#include <QDateTime>
-#include <QFlag>
-#include <QGroupBox>
-#include <QHBoxLayout>
 #include <QLabel>
 #include <QMenu>
+#include <QMessageBox>
+#include <QPushButton>
 #include <QRegularExpression>
 #include <QSplitter>
 #include <QStringListModel>
-#include <QStringLiteral>
 #include <QSystemTrayIcon>
 #include <QToolButton>
 #include <QVBoxLayout>
-#include <QWidget>
+#include <QtCore/qdatetime.h>
 #include <functional>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
@@ -58,8 +46,6 @@
 #include <libcockatrice/protocol/pending_command.h>
 #include <libcockatrice/settings/chat_settings.h>
 #include <libcockatrice/utility/string_limits.h>
-#include <qnamespace.h>
-#include <string>
 
 TabRoom::TabRoom(TabSupervisor *_tabSupervisor,
                  AbstractClient *_client,
diff --git a/cockatrice/src/interface/widgets/tabs/tab_room.h b/cockatrice/src/interface/widgets/tabs/tab_room.h
index 031056145..7d01d5cf6 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_room.h
+++ b/cockatrice/src/interface/widgets/tabs/tab_room.h
@@ -8,21 +8,16 @@
 #ifndef TAB_ROOM_H
 #define TAB_ROOM_H
 
+#include "../interface/widgets/utility/line_edit_completer.h"
 #include "tab.h"
 
-#include <QList>
+#include <QFocusEvent>
+#include <QGroupBox>
 #include <QMap>
-#include <QString>
-#include <QStringList>
-#include <qtmetamacros.h>
+#include <QStringListModel>
 
 class UserListProxy;
-class QAction;
-class QGroupBox;
-class QMenu;
-class QStringListModel;
-class TabSupervisor;
-
+class UserListManager;
 namespace google
 {
 namespace protobuf
@@ -35,9 +30,12 @@ class UserListWidget;
 class UserListPanelWidget;
 class QLabel;
 class ChatView;
+class QPushButton;
+class QTextTable;
 class QCompleter;
 class RoomEvent;
 class ServerInfo_Room;
+class ServerInfo_Game;
 class Event_ListGames;
 class Event_JoinRoom;
 class Event_LeaveRoom;
diff --git a/cockatrice/src/interface/widgets/tabs/tab_server.cpp b/cockatrice/src/interface/widgets/tabs/tab_server.cpp
index 0f3e76c76..fca32094c 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_server.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_server.cpp
@@ -1,20 +1,14 @@
 #include "tab_server.h"
 
-#include "libcockatrice/protocol/pb/response.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_room.pb.h"
+#include "../interface/widgets/server/user/user_list_widget.h"
 #include "tab_supervisor.h"
 
 #include <QHBoxLayout>
 #include <QHeaderView>
-#include <QMap>
+#include <QInputDialog>
 #include <QMessageBox>
 #include <QPushButton>
-#include <QSharedPointer>
-#include <QTextBrowser>
-#include <QTreeWidget>
-#include <QTreeWidgetItem>
-#include <QVBoxLayout>
-#include <QWidget>
+#include <QTextEdit>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/event_list_rooms.pb.h>
 #include <libcockatrice/protocol/pb/event_server_message.pb.h>
@@ -22,9 +16,6 @@
 #include <libcockatrice/protocol/pb/room_commands.pb.h>
 #include <libcockatrice/protocol/pb/session_commands.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
-#include <qnamespace.h>
-
-class TabRoom;
 
 RoomSelector::RoomSelector(AbstractClient *_client, QWidget *parent) : QGroupBox(parent), client(_client)
 {
diff --git a/cockatrice/src/interface/widgets/tabs/tab_server.h b/cockatrice/src/interface/widgets/tabs/tab_server.h
index eb2f572fe..121ff814d 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_server.h
+++ b/cockatrice/src/interface/widgets/tabs/tab_server.h
@@ -12,21 +12,20 @@
 #include <QGroupBox>
 #include <QHash>
 #include <QSet>
-#include <QString>
-#include <QVariant>
-#include <qtmetamacros.h>
+#include <QTextBrowser>
+#include <QTreeWidget>
 
 class AbstractClient;
+class QTextEdit;
+class QLabel;
+class UserListWidget;
 class QPushButton;
+
 class Event_ListRooms;
 class Event_ServerMessage;
 class Response;
 class ServerInfo_Room;
 class CommandContainer;
-class QTextBrowser;
-class QTreeWidget;
-class QWidget;
-class TabSupervisor;
 
 class RoomSelector : public QGroupBox
 {
diff --git a/cockatrice/src/interface/widgets/tabs/tab_supervisor.cpp b/cockatrice/src/interface/widgets/tabs/tab_supervisor.cpp
index 2352d7d7b..0dc246eaa 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_supervisor.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_supervisor.cpp
@@ -2,27 +2,14 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../../client/settings/shortcuts_settings.h"
-#include "../../../game/abstract_game.h"
-#include "../../../game/game_event_handler.h"
-#include "../../../game/game_meta_info.h"
-#include "../../deck_loader/loaded_deck.h"
-#include "../../intents/contexts/context_connect_to_server.h"
-#include "../../intents/contexts/context_join_game.h"
-#include "../../intents/contexts/context_join_room.h"
-#include "../../intents/intent.h"
 #include "../../intents/intent_join_server_game.h"
 #include "../interface/pixel_map_generator.h"
 #include "../interface/widgets/server/game_link.h"
 #include "../interface/widgets/server/user/user_list_manager.h"
+#include "../interface/widgets/server/user/user_list_widget.h"
 #include "../main.h"
-#include "abstract_tab_deck_editor.h"
 #include "api/archidekt/tab_archidekt.h"
-#include "api/edhrec/tab_edhrec.h"
 #include "api/edhrec/tab_edhrec_main.h"
-#include "latency_tracker.h"
-#include "libcockatrice/protocol/pb/serverinfo_game.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_gametype.pb.h"
-#include "tab.h"
 #include "tab_account.h"
 #include "tab_admin.h"
 #include "tab_card_art_rules.h"
@@ -40,31 +27,14 @@
 #include "tab_room.h"
 #include "tab_server.h"
 #include "tab_visual_database_display.h"
-#include "user_level.h"
 #include "visual_deck_editor/tab_deck_editor_visual.h"
+#include "visual_deck_editor/tab_deck_editor_visual_tab_widget.h"
 #include "visual_deck_storage/tab_deck_storage_visual.h"
 
-#include <QAction>
 #include <QApplication>
-#include <QCloseEvent>
-#include <QCommonStyle>
-#include <QDebug>
-#include <QFlag>
-#include <QIcon>
-#include <QListIterator>
-#include <QMapIterator>
-#include <QMenu>
 #include <QMessageBox>
-#include <QMessageLogger>
-#include <QObject>
 #include <QPainter>
-#include <QRect>
-#include <QSharedPointer>
-#include <QStringLiteral>
-#include <QStyle>
-#include <QStyleOption>
 #include <QSystemTrayIcon>
-#include <QTabBar>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/network/client/remote/remote_client.h>
 #include <libcockatrice/protocol/pb/event_game_joined.pb.h>
@@ -75,16 +45,11 @@
 #include <libcockatrice/protocol/pb/room_event.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_room.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
+#include <libcockatrice/protocol/pending_command.h>
 #include <libcockatrice/settings/chat_settings.h>
 #include <libcockatrice/settings/deck_editor_settings.h>
 #include <libcockatrice/settings/interface_settings.h>
 #include <libcockatrice/settings/tabs_settings.h>
-#include <memory>
-#include <qnamespace.h>
-#include <string>
-#include <utility>
-
-class QWidget;
 
 QRect MacOSTabFixStyle::subElementRect(SubElement element, const QStyleOption *option, const QWidget *widget) const
 {
@@ -919,7 +884,6 @@ void TabSupervisor::openTabReport()
     myAddTab(tabReport, aTabReport);
     connect(tabReport, &TabReport::openReplay, this, &TabSupervisor::openReplay);
     connect(tabReport, &TabReport::requestJoinGame, this, &TabSupervisor::joinReportGame);
-    connect(tabReport, &TabReport::openMessageDialog, this, &TabSupervisor::addMessageTab);
     connect(tabReport, &QObject::destroyed, this, [this] {
         tabReport = nullptr;
         aTabReport->setChecked(false);
diff --git a/cockatrice/src/interface/widgets/tabs/tab_supervisor.h b/cockatrice/src/interface/widgets/tabs/tab_supervisor.h
index 9c7dc48d1..1a4f7f749 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_supervisor.h
+++ b/cockatrice/src/interface/widgets/tabs/tab_supervisor.h
@@ -8,36 +8,29 @@
 #ifndef TAB_SUPERVISOR_H
 #define TAB_SUPERVISOR_H
 
+#include "../../deck_loader/deck_loader.h"
 #include "../interface/widgets/server/game_link.h"
-#include "libcockatrice/card/card_info.h"
+#include "../interface/widgets/server/user/user_list_proxy.h"
+#include "abstract_tab_deck_editor.h"
+#include "api/archidekt/tab_archidekt.h"
+#include "api/edhrec/tab_edhrec.h"
+#include "api/edhrec/tab_edhrec_main.h"
+#include "tab_visual_database_display.h"
+#include "visual_deck_editor/tab_deck_editor_visual.h"
+#include "visual_deck_storage/tab_deck_storage_visual.h"
 
 #include <QAbstractButton>
-#include <QList>
 #include <QLoggingCategory>
 #include <QMap>
-#include <QMenu>
 #include <QProxyStyle>
-#include <QSize>
-#include <QString>
 #include <QTabWidget>
 #include <libcockatrice/network/client/abstract/latency_tracker.h>
-#include <qtmetamacros.h>
 
 class TabCardArtRules;
-class AbstractTabDeckEditor;
-class QAction;
-class QWidget;
-class TabArchidekt;
-class TabDeckEditorVisual;
-class TabDeckStorageVisual;
-class TabEdhRec;
-class TabEdhRecMain;
-class TabVisualDatabaseDisplay;
-struct LoadedDeck;
-
 inline Q_LOGGING_CATEGORY(TabSupervisorLog, "tab_supervisor");
 
 class UserListManager;
+class QMenu;
 class AbstractClient;
 class Tab;
 class TabServer;
@@ -63,6 +56,7 @@ class Event_NotifyUser;
 class ServerInfo_Room;
 class ServerInfo_User;
 class GameReplay;
+class DeckList;
 
 class MacOSTabFixStyle : public QProxyStyle
 {
diff --git a/cockatrice/src/interface/widgets/tabs/tab_visual_database_display.cpp b/cockatrice/src/interface/widgets/tabs/tab_visual_database_display.cpp
index f4b007072..3112e7ada 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_visual_database_display.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_visual_database_display.cpp
@@ -1,7 +1,6 @@
 #include "tab_visual_database_display.h"
 
-#include "../visual_database_display/visual_database_display_widget.h"
-#include "card_database_model.h"
+#include "tab_deck_editor.h"
 #include "tab_supervisor.h"
 
 #include <libcockatrice/card/database/card_database_manager.h>
diff --git a/cockatrice/src/interface/widgets/tabs/tab_visual_database_display.h b/cockatrice/src/interface/widgets/tabs/tab_visual_database_display.h
index 31633f10c..3a4bcd6ea 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_visual_database_display.h
+++ b/cockatrice/src/interface/widgets/tabs/tab_visual_database_display.h
@@ -8,14 +8,8 @@
 #define TAB_VISUAL_DATABASE_DISPLAY_H
 
 #include "../interface/widgets/visual_database_display/visual_database_display_widget.h"
-#include "libcockatrice/card/card_info.h"
 #include "tab.h"
 
-#include <QString>
-#include <qtmetamacros.h>
-
-class TabSupervisor;
-
 class TabVisualDatabaseDisplay : public Tab
 {
     Q_OBJECT
diff --git a/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp b/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp
index be7255dc3..0f43893d3 100644
--- a/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp
+++ b/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp
@@ -2,53 +2,37 @@
 
 #include "../../../../client/settings/cache_settings.h"
 #include "../../../../client/settings/shortcuts_settings.h"
-#include "../../../deck_loader/loaded_deck.h"
-#include "../../deck_editor/deck_editor_card_database_dock_widget.h"
-#include "../../deck_editor/deck_editor_card_info_dock_widget.h"
-#include "../../deck_editor/deck_editor_deck_dock_widget.h"
-#include "../../deck_editor/deck_editor_filter_dock_widget.h"
-#include "../../deck_editor/deck_editor_printing_selector_dock_widget.h"
+#include "../../cards/card_info_display_widget.h"
 #include "../../deck_editor/deck_state_manager.h"
 #include "../../deck_editor/deck_zone_dialog.h"
+#include "../../filters/filter_builder.h"
+#include "../../interface/pixel_map_generator.h"
+#include "../../interface/widgets/cards/card_info_frame_widget.h"
 #include "../../interface/widgets/deck_analytics/deck_analytics_widget.h"
 #include "../../interface/widgets/visual_deck_editor/visual_deck_editor_widget.h"
-#include "../../menus/deck_editor_menu.h"
-#include "../../visual_database_display/visual_database_display_widget.h"
-#include "../../visual_deck_editor/visual_deck_editor_sample_hand_widget.h"
+#include "../tab_deck_editor.h"
 #include "../tab_supervisor.h"
-#include "libcockatrice/card/printing/exact_card.h"
-#include "libcockatrice/deck_list/tree/inner_deck_list_node.h"
 #include "tab_deck_editor_visual_tab_widget.h"
 
 #include <QAction>
-#include <QApplication>
-#include <QByteArray>
-#include <QDebug>
+#include <QCloseEvent>
+#include <QCompleter>
+#include <QDir>
 #include <QDockWidget>
-#include <QEvent>
-#include <QFlags>
-#include <QItemSelection>
-#include <QItemSelectionModel>
+#include <QHeaderView>
 #include <QLineEdit>
-#include <QList>
-#include <QLoggingCategory>
-#include <QMainWindow>
-#include <QMap>
 #include <QMenu>
-#include <QMessageLogger>
-#include <QModelIndex>
-#include <QMouseEvent>
-#include <QSize>
+#include <QProcessEnvironment>
+#include <QSplitter>
+#include <QTextStream>
 #include <QTimer>
 #include <QTreeView>
 #include <QVBoxLayout>
-#include <QWidget>
-#include <functional>
 #include <libcockatrice/models/deck_list/deck_list_model.h>
+#include <libcockatrice/protocol/pb/command_deck_upload.pb.h>
+#include <libcockatrice/protocol/pending_command.h>
 #include <libcockatrice/settings/deck_editor_settings.h>
 #include <libcockatrice/settings/layouts_settings.h>
-#include <qnamespace.h>
-#include <qobjectdefs.h>
 
 /**
  * @brief Constructs the TabDeckEditorVisual instance.
diff --git a/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.h b/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.h
index f5eb9981a..fb09578c4 100644
--- a/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.h
+++ b/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.h
@@ -1,19 +1,8 @@
 #ifndef WINDOW_DECKEDITORVISUAL_H
 #define WINDOW_DECKEDITORVISUAL_H
 
-#include "../abstract_tab_deck_editor.h"
-
-#include <QMouseEvent>
-#include <QString>
-#include <qtmetamacros.h>
-
-class ExactCard;
-class QDockWidget;
-class QHBoxLayout;
-class QVBoxLayout;
-class QWidget;
-class TabDeckEditorVisualTabWidget;
-class TabSupervisor;
+#include "../tab.h"
+#include "tab_deck_editor_visual_tab_widget.h"
 
 /**
  * @class TabDeckEditorVisual
diff --git a/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp b/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp
index 8e01ff983..5ccfcc28f 100644
--- a/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp
+++ b/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp
@@ -1,24 +1,7 @@
 #include "tab_deck_editor_visual_tab_widget.h"
 
-#include "../../deck_analytics/deck_analytics_widget.h"
-#include "../../deck_analytics/deck_list_statistics_analyzer.h"
-#include "../../deck_editor/deck_editor_deck_dock_widget.h"
 #include "../../interface/widgets/visual_database_display/visual_database_display_widget.h"
-#include "../../visual_deck_editor/visual_deck_editor_sample_hand_widget.h"
-#include "../../visual_deck_editor/visual_deck_editor_widget.h"
 #include "../abstract_tab_deck_editor.h"
-#include "libcockatrice/card/printing/exact_card.h"
-#include "libcockatrice/deck_list/tree/inner_deck_list_node.h"
-
-#include <QApplication>
-#include <QFlags>
-#include <QVBoxLayout>
-#include <QWidget>
-#include <qnamespace.h>
-
-class CardDatabaseModel;
-class DeckListModel;
-class QMouseEvent;
 
 /**
  * @brief Constructs the TabDeckEditorVisualTabWidget.
diff --git a/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.h b/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.h
index fff978f42..4f04b51f6 100644
--- a/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.h
+++ b/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.h
@@ -1,25 +1,16 @@
 #ifndef TAB_DECK_EDITOR_VISUAL_TAB_WIDGET_H
 #define TAB_DECK_EDITOR_VISUAL_TAB_WIDGET_H
 
-#include "libcockatrice/card/card_info.h"
+#include "../../interface/widgets/deck_analytics/deck_analytics_widget.h"
+#include "../../interface/widgets/printing_selector/printing_selector.h"
+#include "../../interface/widgets/visual_database_display/visual_database_display_widget.h"
+#include "../../interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.h"
+#include "../../interface/widgets/visual_deck_editor/visual_deck_editor_widget.h"
+#include "../abstract_tab_deck_editor.h"
 
-#include <QMouseEvent>
-#include <QString>
 #include <QTabWidget>
-#include <qtmetamacros.h>
-
-class AbstractTabDeckEditor;
-class CardDatabaseModel;
-class DeckAnalyticsWidget;
-class DeckListModel;
-class DeckListStatisticsAnalyzer;
-class ExactCard;
-class PrintingSelector;
-class QVBoxLayout;
-class QWidget;
-class VisualDatabaseDisplayWidget;
-class VisualDeckEditorSampleHandWidget;
-class VisualDeckEditorWidget;
+#include <QVBoxLayout>
+#include <QWidget>
 
 /**
  * @class TabDeckEditorVisualTabWidget
diff --git a/cockatrice/src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp b/cockatrice/src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp
index cb6dfab9c..03df76b03 100644
--- a/cockatrice/src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp
+++ b/cockatrice/src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp
@@ -1,30 +1,23 @@
 #include "tab_deck_storage_visual.h"
 
 #include "../../../../client/settings/cache_settings.h"
-#include "../../../deck_loader/deck_file_format.h"
 #include "../../../deck_loader/deck_loader.h"
-#include "../../../deck_loader/loaded_deck.h"
 #include "../../cards/additional_info/deck_color_identity.h"
 #include "../../deck_share/deck_share_utils.h"
-#include "../../deck_share/share_bar_widget.h"
 #include "../../interface/widgets/visual_deck_storage/visual_deck_storage_widget.h"
-#include "../tab.h"
 #include "../tab_supervisor.h"
 
 #include <QMessageBox>
 #include <QTimer>
 #include <QVBoxLayout>
-#include <QWidget>
-#include <QtGlobal>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/deck_list/deck_list.h>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/command_deck_share_create.pb.h>
 #include <libcockatrice/protocol/pb/response.pb.h>
+#include <libcockatrice/protocol/pb/response_deck_share_create.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
 #include <libcockatrice/settings/network_settings.h>
-#include <optional>
-#include <string>
 
 TabDeckStorageVisual::TabDeckStorageVisual(TabSupervisor *_tabSupervisor, AbstractClient *_client)
     : Tab(_tabSupervisor), visualDeckStorageWidget(new VisualDeckStorageWidget(this)), client(_client),
diff --git a/cockatrice/src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h b/cockatrice/src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h
index 13a078fce..7cd4e7d17 100644
--- a/cockatrice/src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h
+++ b/cockatrice/src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h
@@ -10,18 +10,22 @@
 #include "../../deck_share/share_bar_widget.h"
 #include "../tab.h"
 
-#include <QList>
-#include <QString>
 #include <QStringList>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
-#include <qtmetamacros.h>
 
 struct LoadedDeck;
+class AbstractClient;
 class CommandContainer;
+class DeckPreviewWidget;
+class QFileSystemModel;
+class QGroupBox;
 class QTimer;
+class QToolBar;
+class QTreeView;
+class QTreeWidget;
+class QTreeWidgetItem;
 class Response;
 class VisualDeckStorageWidget;
-class TabSupervisor;
 
 class TabDeckStorageVisual final : public Tab
 {
diff --git a/cockatrice/src/interface/widgets/utility/card_completer_delegate.cpp b/cockatrice/src/interface/widgets/utility/card_completer_delegate.cpp
index 8042fb9fc..29bf2263e 100644
--- a/cockatrice/src/interface/widgets/utility/card_completer_delegate.cpp
+++ b/cockatrice/src/interface/widgets/utility/card_completer_delegate.cpp
@@ -2,42 +2,18 @@
 
 #include "../../pixel_map_generator.h"
 #include "../cards/additional_info/mana_cost_widget.h"
-#include "libcockatrice/card/database/card_database_querier.h"
-#include "libcockatrice/card/set/card_set.h"
 
-#include <QBrush>
-#include <QChar>
-#include <QFlags>
-#include <QFont>
 #include <QFontMetrics>
 #include <QLinearGradient>
-#include <QList>
-#include <QModelIndex>
 #include <QPainter>
 #include <QPainterPath>
-#include <QPalette>
-#include <QPen>
-#include <QPixmap>
-#include <QPoint>
-#include <QRect>
-#include <QRectF>
 #include <QRegularExpression>
 #include <QSet>
-#include <QSharedPointer>
-#include <QSize>
-#include <QStringList>
-#include <QStyle>
 #include <QStyleOptionViewItem>
-#include <QVariant>
-#include <QtGlobal>
 #include <libcockatrice/card/card_info.h>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/card/printing/printing_info.h>
 #include <libcockatrice/models/database/card/card_search_model.h>
-#include <qnamespace.h>
-
-class QObject;
-template <class T> class QSharedPointer;
 
 // ---------------------------------------------------------------------------
 // Internal colour helpers
diff --git a/cockatrice/src/interface/widgets/utility/card_completer_delegate.h b/cockatrice/src/interface/widgets/utility/card_completer_delegate.h
index ad81d86e4..78667f56b 100644
--- a/cockatrice/src/interface/widgets/utility/card_completer_delegate.h
+++ b/cockatrice/src/interface/widgets/utility/card_completer_delegate.h
@@ -9,16 +9,10 @@
 
 #include <QCache>
 #include <QColor>
-#include <QString>
+#include <QPixmap>
 #include <QStyledItemDelegate>
-#include <qtmetamacros.h>
 
 class CardInfo;
-class QObject;
-class QPainter;
-class QPoint;
-class QRect;
-template <class T> class QSharedPointer;
 
 /**
  * @brief Paints styled card completer popup rows.
diff --git a/cockatrice/src/interface/widgets/utility/card_completer_styler.cpp b/cockatrice/src/interface/widgets/utility/card_completer_styler.cpp
index 1ddcc4200..6794ccbb4 100644
--- a/cockatrice/src/interface/widgets/utility/card_completer_styler.cpp
+++ b/cockatrice/src/interface/widgets/utility/card_completer_styler.cpp
@@ -2,37 +2,20 @@
 
 #include "../cards/card_info_picture_enlarged_widget.h"
 #include "card_completer_delegate.h"
-#include "libcockatrice/card/database/card_database_querier.h"
-#include "libcockatrice/card/printing/exact_card.h"
 #include "reversed_completer_model.h"
 
-#include <QAbstractAnimation>
 #include <QAbstractItemModel>
 #include <QAbstractItemView>
-#include <QByteArray>
 #include <QCompleter>
 #include <QEvent>
-#include <QItemSelectionModel>
 #include <QKeyEvent>
-#include <QList>
 #include <QMouseEvent>
-#include <QPoint>
 #include <QPropertyAnimation>
-#include <QRect>
 #include <QScreen>
-#include <QSharedPointer>
 #include <QSize>
-#include <QString>
-#include <QVariant>
-#include <QWidget>
-#include <QtGlobal>
 #include <libcockatrice/card/card_info.h>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/models/database/card/card_search_model.h>
-#include <libcockatrice/utility/card_ref.h>
-#include <qnamespace.h>
-
-template <class T> class QSharedPointer;
 
 namespace
 {
@@ -149,9 +132,7 @@ bool CardCompleterStyler::handlePopupKeyPress(QKeyEvent *event)
     const int newRow = qBound(0, currentRow + step, rowCount - 1);
 
     if (newRow != currentRow) {
-        const QModelIndex newIndex = completer->completionModel()->index(newRow, completer->completionColumn());
-        popup->selectionModel()->setCurrentIndex(newIndex,
-                                                 QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows);
+        popup->setCurrentIndex(completer->completionModel()->index(newRow, completer->completionColumn()));
     }
 
     return true;
@@ -180,8 +161,7 @@ void CardCompleterStyler::ensureClosestSelected()
     const int closestRow = rowCount - 1;
 
     if (currentRow != closestRow) {
-        popup->selectionModel()->setCurrentIndex(completionModel->index(closestRow, completer->completionColumn()),
-                                                 QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows);
+        popup->setCurrentIndex(completionModel->index(closestRow, completer->completionColumn()));
     }
 }
 
diff --git a/cockatrice/src/interface/widgets/utility/card_completer_styler.h b/cockatrice/src/interface/widgets/utility/card_completer_styler.h
index 9245c9095..616e3fe61 100644
--- a/cockatrice/src/interface/widgets/utility/card_completer_styler.h
+++ b/cockatrice/src/interface/widgets/utility/card_completer_styler.h
@@ -9,7 +9,6 @@
 
 #include <QModelIndex>
 #include <QObject>
-#include <qtmetamacros.h>
 
 class CardInfoPictureEnlargedWidget;
 class QCompleter;
diff --git a/cockatrice/src/interface/widgets/utility/compact_push_button.cpp b/cockatrice/src/interface/widgets/utility/compact_push_button.cpp
index 7df105d15..cf98bfede 100644
--- a/cockatrice/src/interface/widgets/utility/compact_push_button.cpp
+++ b/cockatrice/src/interface/widgets/utility/compact_push_button.cpp
@@ -1,9 +1,5 @@
 #include "compact_push_button.h"
 
-#include <QFontMetrics>
-#include <QSizePolicy>
-#include <QWidget>
-
 CompactPushButton::CompactPushButton(QWidget *parent) : QPushButton(parent)
 {
     setCheckable(true);
diff --git a/cockatrice/src/interface/widgets/utility/compact_push_button.h b/cockatrice/src/interface/widgets/utility/compact_push_button.h
index fa8c8080a..b0017beee 100644
--- a/cockatrice/src/interface/widgets/utility/compact_push_button.h
+++ b/cockatrice/src/interface/widgets/utility/compact_push_button.h
@@ -1,12 +1,7 @@
 #ifndef COCKATRICE_COMPACT_PUSH_BUTTON_H
 #define COCKATRICE_COMPACT_PUSH_BUTTON_H
 
-#include <QIcon>
 #include <QPushButton>
-#include <QString>
-#include <qtmetamacros.h>
-
-class QWidget;
 
 class CompactPushButton : public QPushButton
 {
diff --git a/cockatrice/src/interface/widgets/utility/completer_utils.cpp b/cockatrice/src/interface/widgets/utility/completer_utils.cpp
index f1cd9c6a7..23ddb30b0 100644
--- a/cockatrice/src/interface/widgets/utility/completer_utils.cpp
+++ b/cockatrice/src/interface/widgets/utility/completer_utils.cpp
@@ -3,66 +3,19 @@
 #include "../../../client/settings/cache_settings.h"
 #include "card_completer_styler.h"
 
-#include <QAbstractItemView>
 #include <QCompleter>
 #include <QLineEdit>
-#include <QModelIndex>
 #include <QObject>
-#include <QPainter>
-#include <QPalette>
 #include <QRegularExpression>
-#include <QString>
 #include <QStringListModel>
-#include <QStyle>
-#include <QStyleOptionViewItem>
-#include <QStyledItemDelegate>
 #include <libcockatrice/card/card_localization.h>
 #include <libcockatrice/models/database/card/card_completer_proxy_model.h>
 #include <libcockatrice/models/database/card/card_search_model.h>
+#include <libcockatrice/models/database/card_database_display_model.h>
 #include <libcockatrice/settings/cards_display_settings.h>
-#include <qnamespace.h>
 
 namespace
 {
-/**
- * @brief Paints the mention popup's current row with a visible highlight.
- *
- * A completer popup is a transient window that is usually not the application's
- * active window, so the style paints a selected row using the palette's
- * Inactive highlight group. Most themes set that colour close to the popup
- * background, which hides the current completion entirely. Mirror the active
- * highlight into the inactive group so the selection stays visible.
- */
-class MentionCompleterDelegate : public QStyledItemDelegate
-{
-public:
-    explicit MentionCompleterDelegate(QAbstractItemView *view) : QStyledItemDelegate(view), view(view)
-    {
-    }
-
-    void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override
-    {
-        QStyleOptionViewItem opt = option;
-        opt.showDecorationSelected = true;
-
-        if (view->currentIndex() == index) {
-            opt.state |= QStyle::State_HasFocus;
-        }
-
-        if (opt.state & QStyle::State_Selected) {
-            opt.palette.setColor(QPalette::Inactive, QPalette::Highlight,
-                                 opt.palette.color(QPalette::Active, QPalette::Highlight));
-            opt.palette.setColor(QPalette::Inactive, QPalette::HighlightedText,
-                                 opt.palette.color(QPalette::Active, QPalette::HighlightedText));
-        }
-
-        QStyledItemDelegate::paint(painter, opt, index);
-    }
-
-private:
-    QAbstractItemView *view;
-};
-
 void applyCardSearchLanguage(CardSearchModel *searchModel)
 {
     const CardsDisplaySettings &cardsDisplay = SettingsCache::instance().cardsDisplay();
@@ -115,11 +68,5 @@ QCompleter *createMentionCompleter(QStringListModel *model, QObject *parent)
     completer->setCaseSensitivity(Qt::CaseInsensitive);
     completer->setMaxVisibleItems(5);
     completer->setFilterMode(Qt::MatchStartsWith);
-
-    // Force the popup to be created so the highlight delegate can be installed;
-    // otherwise QCompleter's own delegate hides the selection on most themes.
-    QAbstractItemView *popup = completer->popup();
-    popup->setItemDelegate(new MentionCompleterDelegate(popup));
-
     return completer;
 }
diff --git a/cockatrice/src/interface/widgets/utility/custom_line_edit.cpp b/cockatrice/src/interface/widgets/utility/custom_line_edit.cpp
index d524041c3..05f56c275 100644
--- a/cockatrice/src/interface/widgets/utility/custom_line_edit.cpp
+++ b/cockatrice/src/interface/widgets/utility/custom_line_edit.cpp
@@ -3,17 +3,11 @@
 #include "../../../client/settings/cache_settings.h"
 #include "../../../client/settings/shortcuts_settings.h"
 
-#include <QCoreApplication>
-#include <QEvent>
-#include <QFlags>
 #include <QKeyEvent>
-#include <QKeySequence>
 #include <QLineEdit>
-#include <QList>
-#include <QString>
+#include <QObject>
 #include <QTreeView>
-#include <QVector>
-#include <qnamespace.h>
+#include <QWidget>
 
 LineEditUnfocusable::LineEditUnfocusable(QWidget *parent) : QLineEdit(parent)
 {
diff --git a/cockatrice/src/interface/widgets/utility/custom_line_edit.h b/cockatrice/src/interface/widgets/utility/custom_line_edit.h
index 4d256d3dc..8c389b797 100644
--- a/cockatrice/src/interface/widgets/utility/custom_line_edit.h
+++ b/cockatrice/src/interface/widgets/utility/custom_line_edit.h
@@ -8,7 +8,6 @@
 #define CUSTOMLINEEDIT_H
 
 #include <QLineEdit>
-#include <qtmetamacros.h>
 
 class QTreeView;
 class QKeyEvent;
diff --git a/cockatrice/src/interface/widgets/utility/get_text_with_max.cpp b/cockatrice/src/interface/widgets/utility/get_text_with_max.cpp
index 1a1bc924d..134352eb3 100644
--- a/cockatrice/src/interface/widgets/utility/get_text_with_max.cpp
+++ b/cockatrice/src/interface/widgets/utility/get_text_with_max.cpp
@@ -2,8 +2,6 @@
 
 #include <QInputDialog>
 
-class QWidget;
-
 QString getTextWithMax(QWidget *parent,
                        const QString &title,
                        const QString &label,
diff --git a/cockatrice/src/interface/widgets/utility/get_text_with_max.h b/cockatrice/src/interface/widgets/utility/get_text_with_max.h
index f1c89c703..424bb0c6a 100644
--- a/cockatrice/src/interface/widgets/utility/get_text_with_max.h
+++ b/cockatrice/src/interface/widgets/utility/get_text_with_max.h
@@ -8,11 +8,8 @@
 #define GETTEXTWITHMAX_H
 
 #include <QLineEdit>
-#include <QString>
+#include <QWidget>
 #include <libcockatrice/utility/string_limits.h>
-#include <qnamespace.h>
-
-class QWidget;
 
 QString getTextWithMax(QWidget *parent,
                        const QString &title,
diff --git a/cockatrice/src/interface/widgets/utility/line_edit_completer.cpp b/cockatrice/src/interface/widgets/utility/line_edit_completer.cpp
index d692fb41b..3a678029d 100644
--- a/cockatrice/src/interface/widgets/utility/line_edit_completer.cpp
+++ b/cockatrice/src/interface/widgets/utility/line_edit_completer.cpp
@@ -1,18 +1,8 @@
 #include "line_edit_completer.h"
 
-#include <QAbstractItemModel>
 #include <QAbstractItemView>
-#include <QChar>
-#include <QCompleter>
 #include <QFocusEvent>
-#include <QItemSelectionModel>
 #include <QKeyEvent>
-#include <QModelIndex>
-#include <QVariant>
-#include <QtGlobal>
-#include <qnamespace.h>
-
-class QWidget;
 
 LineEditCompleter::LineEditCompleter(QWidget *parent) : LineEditUnfocusable(parent)
 {
@@ -50,99 +40,47 @@ void LineEditCompleter::focusOutEvent(QFocusEvent *e)
 {
     LineEditUnfocusable::focusOutEvent(e);
 
-    // Commit completion when focus moves away via Tab if popup is visible.
+    // Only commit the highlighted completion when focus moves away via Tab.
     // Other focus losses (e.g. the unfocus shortcut / Escape) must simply close
     // the popup without inserting anything.
-    bool popupWasVisible = false;
+    if (e->reason() != Qt::TabFocusReason) {
+        hideCompleterPopups();
+        return;
+    }
+
     for (auto &info : completers) {
-        if (info.completer->popup()->isVisible()) {
-            popupWasVisible = true;
-            const QModelIndex currentIndex = info.completer->popup()->currentIndex();
-            QString completionText;
-            if (currentIndex.isValid()) {
-                completionText = currentIndex.data().toString();
-            } else {
-                completionText = info.completer->currentCompletion();
-            }
-            if (!completionText.isEmpty()) {
-                insertCompletion(info.completer, completionText);
-            }
+        if (!info.completer->popup()->isVisible()) {
+            continue;
+        }
+
+        const QModelIndex currentIndex = info.completer->popup()->currentIndex();
+        if (currentIndex.isValid()) {
+            insertCompletion(info.completer, currentIndex.data().toString());
         }
     }
+
     hideCompleterPopups();
-
-    if (popupWasVisible && e->reason() == Qt::TabFocusReason) {
-        // Refocus the edit so Tab doesn't move focus away
-        // Use a queued connection to ensure focus is restored after the focus change completes
-        QMetaObject::invokeMethod(this, "setFocus", Qt::QueuedConnection);
-        e->accept();
-        return;
-    }
-
-    if (popupWasVisible) {
-        return;
-    }
 }
 
 void LineEditCompleter::keyPressEvent(QKeyEvent *event)
 {
-    if (event->key() == Qt::Key_Escape) {
-        if (hasVisibleCompleterPopup()) {
-            event->ignore();
-            hideCompleterPopups();
-            return;
-        }
-        LineEditUnfocusable::keyPressEvent(event);
-        return;
-    }
-
-    if (event->key() == Qt::Key_Return || event->key() == Qt::Key_Enter || event->key() == Qt::Key_Space) {
-        for (auto &info : completers) {
-            if (info.completer->popup()->isVisible()) {
-                event->ignore();
-                const QModelIndex currentIndex = info.completer->popup()->currentIndex();
-                QString completionText;
-                if (currentIndex.isValid()) {
-                    completionText = currentIndex.data().toString();
-                } else {
-                    completionText = info.completer->currentCompletion();
-                }
-                if (!completionText.isEmpty()) {
-                    insertCompletion(info.completer, completionText);
-                }
-                hideCompleterPopups();
-                return;
-            }
-        }
-    }
-
-    if (event->key() == Qt::Key_Tab) {
-        // Let Tab proceed normally; focusOutEvent will handle completion if popup is visible
-        LineEditUnfocusable::keyPressEvent(event);
-        return;
-    }
-
     LineEditUnfocusable::keyPressEvent(event);
 
+    if (event->key() == Qt::Key_Escape) {
+        hideCompleterPopups();
+        return;
+    }
+
     QString textValue = text();
     int cursorPos = cursorPosition();
 
     CompleterInfo *active = nullptr;
     QString prefix;
 
-    // An open "[[" card link takes precedence over a mention: while the cursor is
-    // inside it, an earlier "@" must not shadow the card completer.
-    const int openCardPos = textValue.lastIndexOf("[[", cursorPos - 1);
-    const int closeCardPos = openCardPos == -1 ? -1 : textValue.indexOf("]]", openCardPos + 2);
-    const bool insideCardLink = openCardPos != -1 && (closeCardPos == -1 || closeCardPos >= cursorPos);
-
     for (auto &info : completers) {
         bool triggered = false;
         switch (info.trigger) {
             case CompleterTrigger::Mention: {
-                if (insideCardLink) {
-                    break;
-                }
                 int triggerPos = textValue.lastIndexOf("@", cursorPos - 1);
                 if (triggerPos != -1 && (triggerPos == 0 || textValue[triggerPos - 1].isSpace())) {
                     triggered = true;
@@ -186,17 +124,6 @@ void LineEditCompleter::keyPressEvent(QKeyEvent *event)
     }
 
     active->completer->complete();
-
-    // The popup opens without a current row, so nothing is highlighted and there
-    // is no visual indication of what Enter will insert. Select the row that
-    // currentCompletion() would use so the current mention stays visible.
-    auto *completionModel = active->completer->completionModel();
-    const int currentRow = active->completer->currentRow();
-    if (currentRow >= 0 && currentRow < completionModel->rowCount()) {
-        active->completer->popup()->selectionModel()->setCurrentIndex(
-            completionModel->index(currentRow, active->completer->completionColumn()),
-            QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows);
-    }
 }
 
 void LineEditCompleter::insertCompletion(const QString &completion)
diff --git a/cockatrice/src/interface/widgets/utility/line_edit_completer.h b/cockatrice/src/interface/widgets/utility/line_edit_completer.h
index c141682bf..369b7b553 100644
--- a/cockatrice/src/interface/widgets/utility/line_edit_completer.h
+++ b/cockatrice/src/interface/widgets/utility/line_edit_completer.h
@@ -10,12 +10,12 @@
 
 #include "custom_line_edit.h"
 
+#include <QCompleter>
+#include <QFocusEvent>
+#include <QKeyEvent>
 #include <QList>
 #include <QString>
-#include <qtmetamacros.h>
-
-class QCompleter;
-class QWidget;
+#include <QVector>
 
 enum class CompleterTrigger
 {
diff --git a/cockatrice/src/interface/widgets/utility/report_utils.cpp b/cockatrice/src/interface/widgets/utility/report_utils.cpp
index d7fc083c6..aa4558e5c 100644
--- a/cockatrice/src/interface/widgets/utility/report_utils.cpp
+++ b/cockatrice/src/interface/widgets/utility/report_utils.cpp
@@ -1,20 +1,12 @@
 #include "report_utils.h"
 
-#include "libcockatrice/protocol/pb/serverinfo_report.pb.h"
-
 #include <QApplication>
 #include <QBrush>
-#include <QChar>
-#include <QColor>
 #include <QDateTime>
 #include <QPalette>
-#include <QSharedPointer>
 #include <QTableWidget>
-#include <QTableWidgetItem>
 #include <QTextCursor>
 #include <QTextEdit>
-#include <qnamespace.h>
-#include <string>
 
 namespace report_utils
 {
@@ -100,27 +92,10 @@ void renderReportDetails(QTextEdit *chatLogEdit,
                          const QString &moderatorPrefix,
                          const QString &nonModeratorPrefix)
 {
-    QString details;
-    if (report.has_resolution_note() && !report.resolution_note().empty()) {
-        details = QObject::tr("Resolution note: %1").arg(QString::fromStdString(report.resolution_note()));
-    }
-    if (report.has_resolution_time()) {
-        QString resolvedBy = QObject::tr("unknown");
-        if (report.has_resolved_by_name() && !report.resolved_by_name().empty()) {
-            resolvedBy = QString::fromStdString(report.resolved_by_name());
-        }
-        if (!details.isEmpty()) {
-            details += "\n";
-        }
-        details += QObject::tr("Resolved at %1 by %2").arg(formatReportTime(report.resolution_time()), resolvedBy);
-    }
-
     if (report.has_chat_log() && !report.chat_log().empty()) {
-        const QString chatLog = QString::fromStdString(report.chat_log());
-        chatLogEdit->setPlainText(
-            details.isEmpty() ? chatLog : details + "\n\n" + QObject::tr("=== Chat Log ===") + "\n" + chatLog);
+        chatLogEdit->setPlainText(QString::fromStdString(report.chat_log()));
     } else {
-        chatLogEdit->setPlainText(details);
+        chatLogEdit->clear();
     }
 
     commentsEdit->clear();
diff --git a/cockatrice/src/interface/widgets/utility/report_utils.h b/cockatrice/src/interface/widgets/utility/report_utils.h
index 679989486..c6cc96c18 100644
--- a/cockatrice/src/interface/widgets/utility/report_utils.h
+++ b/cockatrice/src/interface/widgets/utility/report_utils.h
@@ -2,11 +2,10 @@
 #define REPORT_UTILS_H
 
 #include <QString>
-#include <QtGlobal>
+#include <libcockatrice/protocol/pb/serverinfo_report.pb.h>
 
 class QTableWidget;
 class QTextEdit;
-class ServerInfo_Report;
 
 namespace report_utils
 {
diff --git a/cockatrice/src/interface/widgets/utility/reversed_completer_model.cpp b/cockatrice/src/interface/widgets/utility/reversed_completer_model.cpp
index 3702798fd..1bc9ba14b 100644
--- a/cockatrice/src/interface/widgets/utility/reversed_completer_model.cpp
+++ b/cockatrice/src/interface/widgets/utility/reversed_completer_model.cpp
@@ -1,10 +1,7 @@
 #include "reversed_completer_model.h"
 
 #include <QAbstractItemModel>
-#include <QDebug>
-#include <QList>
 #include <QModelIndex>
-#include <QPersistentModelIndex>
 #include <QVariant>
 
 void ReversedCompleterModel::setSourceModel(QAbstractItemModel *sourceModel)
diff --git a/cockatrice/src/interface/widgets/utility/reversed_completer_model.h b/cockatrice/src/interface/widgets/utility/reversed_completer_model.h
index cf4b44974..64233a1b0 100644
--- a/cockatrice/src/interface/widgets/utility/reversed_completer_model.h
+++ b/cockatrice/src/interface/widgets/utility/reversed_completer_model.h
@@ -8,8 +8,8 @@
 #define REVERSED_COMPLETER_MODEL_H
 
 #include <QAbstractProxyModel>
-#include <QModelIndex>
-#include <qnamespace.h>
+
+class QAbstractItemModel;
 
 /**
  * @brief A completer model that can present its rows bottom-to-top.
diff --git a/cockatrice/src/interface/widgets/utility/sequence_edit.cpp b/cockatrice/src/interface/widgets/utility/sequence_edit.cpp
index e92287c9a..06561a41d 100644
--- a/cockatrice/src/interface/widgets/utility/sequence_edit.cpp
+++ b/cockatrice/src/interface/widgets/utility/sequence_edit.cpp
@@ -4,16 +4,8 @@
 #include "../../../client/settings/shortcuts_settings.h"
 #include "../../pixel_map_generator.h"
 
-#include <QChar>
-#include <QEvent>
-#include <QFlags>
 #include <QHBoxLayout>
 #include <QKeyEvent>
-#include <QLineEdit>
-#include <QList>
-#include <QPoint>
-#include <QPushButton>
-#include <QStringLiteral>
 #include <QToolTip>
 
 SequenceEdit::SequenceEdit(const QString &_shortcutName, QWidget *parent) : QWidget(parent)
diff --git a/cockatrice/src/interface/widgets/utility/sequence_edit.h b/cockatrice/src/interface/widgets/utility/sequence_edit.h
index 0cdd48ceb..28e18d42f 100644
--- a/cockatrice/src/interface/widgets/utility/sequence_edit.h
+++ b/cockatrice/src/interface/widgets/utility/sequence_edit.h
@@ -7,15 +7,10 @@
 #ifndef SEQUENCEEDIT_H
 #define SEQUENCEEDIT_H
 
-#include <QKeySequence>
-#include <QString>
+#include <QEvent>
+#include <QLineEdit>
+#include <QPushButton>
 #include <QWidget>
-#include <qnamespace.h>
-#include <qtmetamacros.h>
-
-class QKeyEvent;
-class QLineEdit;
-class QPushButton;
 
 class SequenceEdit : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/utility/visibility_change_listener.h b/cockatrice/src/interface/widgets/utility/visibility_change_listener.h
index f154918d6..10928caf6 100644
--- a/cockatrice/src/interface/widgets/utility/visibility_change_listener.h
+++ b/cockatrice/src/interface/widgets/utility/visibility_change_listener.h
@@ -2,9 +2,6 @@
 #define COCKATRICE_VISIBILITY_LISTENER_H
 
 #include <QObject>
-#include <qtmetamacros.h>
-
-class QWidget;
 
 /**
  * @brief This filter listens to the visibility changes of a target widget, emitting signals whenever the visibility of
diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp
index cf815ace0..57c6da762 100644
--- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp
@@ -1,19 +1,8 @@
 #include "visual_database_display_color_filter_widget.h"
 
 #include "../cards/additional_info/mana_symbol_widget.h"
-#include "filter_tree_model.h"
-#include "libcockatrice/filters/filter_card.h"
 
-#include <QAbstractItemModel>
-#include <QComboBox>
-#include <QDebug>
-#include <QHBoxLayout>
-#include <QPersistentModelIndex>
-#include <QSharedPointer>
-#include <QString>
 #include <QTimer>
-#include <QVariant>
-#include <QtGlobal>
 #include <libcockatrice/filters/filter_tree.h>
 
 /**
diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.h b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.h
index 38812b02a..497d25fce 100644
--- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.h
+++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.h
@@ -7,16 +7,11 @@
 #ifndef VISUAL_DATABASE_DISPLAY_COLOR_FILTER_WIDGET_H
 #define VISUAL_DATABASE_DISPLAY_COLOR_FILTER_WIDGET_H
 
-#include <QByteArray>
-#include <QChar>
-#include <QList>
-#include <QMetaType>
-#include <QWidget>
-#include <qtmetamacros.h>
+#include "../../../filters/filter_tree_model.h"
 
-class FilterTreeModel;
-class QComboBox;
-class QHBoxLayout;
+#include <QComboBox>
+#include <QHBoxLayout>
+#include <QWidget>
 
 class VisualDatabaseDisplayColorFilterCircleWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp
index fd005b315..76a611d52 100644
--- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp
@@ -1,28 +1,13 @@
 #include "visual_database_display_filter_save_load_widget.h"
 
 #include "../../../client/settings/cache_settings.h"
-#include "../general/layout_containers/flow_widget.h"
-#include "filter_tree_model.h"
-#include "libcockatrice/filters/filter_card.h"
 #include "visual_database_filter_display_widget.h"
 
-#include <QByteArray>
-#include <QChar>
-#include <QDir>
-#include <QFile>
-#include <QIODevice>
+#include <QHBoxLayout>
 #include <QJsonArray>
 #include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonValue>
-#include <QJsonValueRef>
-#include <QLineEdit>
-#include <QPushButton>
-#include <QRegularExpression>
-#include <QVBoxLayout>
 #include <libcockatrice/filters/filter_tree.h>
 #include <libcockatrice/settings/paths_settings.h>
-#include <qnamespace.h>
 
 VisualDatabaseDisplayFilterSaveLoadWidget::VisualDatabaseDisplayFilterSaveLoadWidget(QWidget *parent,
                                                                                      FilterTreeModel *_filterModel)
diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.h b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.h
index ea8a0ed6b..459633e42 100644
--- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.h
+++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.h
@@ -7,19 +7,17 @@
 #ifndef VISUAL_DATABASE_DISPLAY_FILTER_SAVE_LOAD_WIDGET_H
 #define VISUAL_DATABASE_DISPLAY_FILTER_SAVE_LOAD_WIDGET_H
 
-#include <QList>
-#include <QMap>
-#include <QPair>
-#include <QString>
-#include <QStringList>
-#include <QWidget>
-#include <qtmetamacros.h>
+#include "../../../filters/filter_tree_model.h"
+#include "../general/layout_containers/flow_widget.h"
 
-class FilterTreeModel;
-class FlowWidget;
-class QLineEdit;
-class QPushButton;
-class QVBoxLayout;
+#include <QFile>
+#include <QFileDialog>
+#include <QJsonObject>
+#include <QLineEdit>
+#include <QMap>
+#include <QPushButton>
+#include <QVBoxLayout>
+#include <QWidget>
 
 class VisualDatabaseDisplayFilterSaveLoadWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp
index 3e9d9e525..a59a068dd 100644
--- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp
@@ -2,36 +2,9 @@
 
 #include "../../pixel_map_generator.h"
 #include "../deck_editor/card_database_view.h"
-#include "../quick_settings/settings_button_widget.h"
-#include "card_database_display_model.h"
-#include "visual_database_display_filter_save_load_widget.h"
-#include "visual_database_display_format_legality_filter_widget.h"
-#include "visual_database_display_main_type_filter_widget.h"
-#include "visual_database_display_name_filter_widget.h"
-#include "visual_database_display_set_filter_widget.h"
-#include "visual_database_display_sub_type_filter_widget.h"
 #include "visual_database_display_widget.h"
 
-#include <QAbstractItemView>
-#include <QComboBox>
 #include <QGroupBox>
-#include <QHBoxLayout>
-#include <QIcon>
-#include <QLabel>
-#include <QLayout>
-#include <QList>
-#include <QPixmap>
-#include <QResizeEvent>
-#include <QSize>
-#include <QSizePolicy>
-#include <QString>
-#include <QStringLiteral>
-#include <QVariant>
-#include <QWidget>
-#include <QtGlobal>
-#include <qnamespace.h>
-
-class DeckListModel;
 
 VisualDatabaseDisplayFilterToolbarWidget::VisualDatabaseDisplayFilterToolbarWidget(VisualDatabaseDisplayWidget *_parent,
                                                                                    DeckListModel *deckListModel)
diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.h b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.h
index f97310c1b..8a3555455 100644
--- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.h
+++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.h
@@ -1,22 +1,14 @@
 #ifndef COCKATRICE_VISUAL_DATABASE_DISPLAY_FILTER_TOOLBAR_WIDGET_H
 #define COCKATRICE_VISUAL_DATABASE_DISPLAY_FILTER_TOOLBAR_WIDGET_H
 
-#include "../general/layout_containers/flow_widget.h"
-
-#include <qtmetamacros.h>
+#include "visual_database_display_filter_save_load_widget.h"
+#include "visual_database_display_format_legality_filter_widget.h"
+#include "visual_database_display_main_type_filter_widget.h"
+#include "visual_database_display_name_filter_widget.h"
+#include "visual_database_display_set_filter_widget.h"
+#include "visual_database_display_sub_type_filter_widget.h"
 
 class VisualDatabaseDisplayWidget;
-class DeckListModel;
-class QComboBox;
-class QGroupBox;
-class QLabel;
-class SettingsButtonWidget;
-class VisualDatabaseDisplayFilterSaveLoadWidget;
-class VisualDatabaseDisplayFormatLegalityFilterWidget;
-class VisualDatabaseDisplayMainTypeFilterWidget;
-class VisualDatabaseDisplayNameFilterWidget;
-class VisualDatabaseDisplaySetFilterWidget;
-class VisualDatabaseDisplaySubTypeFilterWidget;
 
 class VisualDatabaseDisplayFilterToolbarWidget : public FlowWidget
 {
diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp
index a5725ff3f..633f07af7 100644
--- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp
@@ -1,29 +1,14 @@
 #include "visual_database_display_format_legality_filter_widget.h"
 
 #include "../../../filters/filter_tree_model.h"
-#include "../general/layout_containers/flow_widget.h"
-#include "libcockatrice/card/database/card_database_querier.h"
-#include "libcockatrice/filters/filter_card.h"
 #include "visual_database_display_filter_button.h"
 
-#include <QAbstractItemModel>
-#include <QDebug>
-#include <QHBoxLayout>
 #include <QLabel>
-#include <QList>
-#include <QPersistentModelIndex>
 #include <QPushButton>
-#include <QSet>
-#include <QSharedPointer>
 #include <QSpinBox>
 #include <QTimer>
-#include <QVBoxLayout>
-#include <QtGlobal>
-#include <algorithm>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/filters/filter_tree.h>
-#include <limits>
-#include <qnamespace.h>
 
 VisualDatabaseDisplayFormatLegalityFilterWidget::VisualDatabaseDisplayFormatLegalityFilterWidget(
     QWidget *parent,
diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.h b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.h
index e94593e67..1b1a1382e 100644
--- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.h
+++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.h
@@ -1,17 +1,16 @@
 #ifndef COCKATRICE_VISUAL_DATABASE_DISPLAY_FORMAT_LEGALITY_FILTER_WIDGET_H
 #define COCKATRICE_VISUAL_DATABASE_DISPLAY_FORMAT_LEGALITY_FILTER_WIDGET_H
 
-#include <QMap>
-#include <QString>
-#include <QWidget>
-#include <qtmetamacros.h>
+#include "../../../filters/filter_tree_model.h"
+#include "../general/layout_containers/flow_widget.h"
 
-class FilterTreeModel;
-class FlowWidget;
-class QLabel;
-class QPushButton;
-class QSpinBox;
-class QVBoxLayout;
+#include <QLabel>
+#include <QMap>
+#include <QPushButton>
+#include <QSpinBox>
+#include <QToolButton>
+#include <QVBoxLayout>
+#include <QWidget>
 
 class VisualDatabaseDisplayFormatLegalityFilterWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp
index eff0fe10b..c44489c1b 100644
--- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp
@@ -1,27 +1,14 @@
 #include "visual_database_display_main_type_filter_widget.h"
 
 #include "../../../filters/filter_tree_model.h"
-#include "../general/layout_containers/flow_widget.h"
-#include "libcockatrice/card/database/card_database_querier.h"
-#include "libcockatrice/filters/filter_card.h"
 #include "visual_database_display_filter_button.h"
 
-#include <QAbstractItemModel>
-#include <QDebug>
-#include <QHBoxLayout>
 #include <QLabel>
-#include <QList>
-#include <QPersistentModelIndex>
 #include <QPushButton>
-#include <QSet>
-#include <QSharedPointer>
 #include <QSpinBox>
 #include <QTimer>
-#include <QVBoxLayout>
-#include <QtGlobal>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/filters/filter_tree.h>
-#include <qnamespace.h>
 
 VisualDatabaseDisplayMainTypeFilterWidget::VisualDatabaseDisplayMainTypeFilterWidget(QWidget *parent,
                                                                                      FilterTreeModel *_filterModel)
diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.h b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.h
index b5a6f332c..6dec58319 100644
--- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.h
+++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.h
@@ -7,17 +7,15 @@
 #ifndef VISUAL_DATABASE_DISPLAY_MAIN_TYPE_FILTER_WIDGET_H
 #define VISUAL_DATABASE_DISPLAY_MAIN_TYPE_FILTER_WIDGET_H
 
-#include <QMap>
-#include <QString>
-#include <QWidget>
-#include <qtmetamacros.h>
+#include "../../../filters/filter_tree_model.h"
+#include "../general/layout_containers/flow_widget.h"
 
-class FilterTreeModel;
-class FlowWidget;
-class QLabel;
-class QPushButton;
-class QSpinBox;
-class QVBoxLayout;
+#include <QLabel>
+#include <QMap>
+#include <QPushButton>
+#include <QSpinBox>
+#include <QVBoxLayout>
+#include <QWidget>
 
 class VisualDatabaseDisplayMainTypeFilterWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp
index d3e497b21..3fa1a782a 100644
--- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp
@@ -1,26 +1,11 @@
 #include "visual_database_display_name_filter_widget.h"
 
 #include "../../../interface/widgets/dialogs/dlg_load_deck_from_clipboard.h"
-#include "../general/layout_containers/flow_widget.h"
-#include "deck_list_model.h"
-#include "filter_tree_model.h"
-#include "libcockatrice/deck_list/deck_list.h"
-#include "libcockatrice/filters/filter_card.h"
-#include "libcockatrice/filters/filter_tree.h"
+#include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
+#include "../deck_editor/deck_state_manager.h"
 #include "visual_database_display_filter_button.h"
 
-#include <QAbstractItemModel>
-#include <QDebug>
-#include <QLineEdit>
-#include <QList>
-#include <QPersistentModelIndex>
-#include <QPushButton>
-#include <QSharedPointer>
-#include <QStringList>
-#include <QTimer>
-#include <QVBoxLayout>
-#include <algorithm>
-#include <qnamespace.h>
+#include <QHBoxLayout>
 
 VisualDatabaseDisplayNameFilterWidget::VisualDatabaseDisplayNameFilterWidget(QWidget *parent,
                                                                              FilterTreeModel *_filterModel,
diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.h b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.h
index 1629cb93b..0c10408ae 100644
--- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.h
+++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.h
@@ -7,17 +7,14 @@
 #ifndef VISUAL_DATABASE_DISPLAY_NAME_FILTER_WIDGET_H
 #define VISUAL_DATABASE_DISPLAY_NAME_FILTER_WIDGET_H
 
-#include <QMap>
-#include <QString>
-#include <QWidget>
-#include <qtmetamacros.h>
+#include "../../../filters/filter_tree_model.h"
+#include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
+#include "../general/layout_containers/flow_widget.h"
 
-class DeckListModel;
-class FilterTreeModel;
-class FlowWidget;
-class QLineEdit;
-class QPushButton;
-class QVBoxLayout;
+#include <QLineEdit>
+#include <QMap>
+#include <QPushButton>
+#include <QWidget>
 
 class VisualDatabaseDisplayNameFilterWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp
index 3d76fb78a..358c3ed88 100644
--- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp
@@ -2,35 +2,15 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../../filters/filter_tree_model.h"
-#include "../general/layout_containers/flow_widget.h"
-#include "libcockatrice/card/database/card_database.h"
-#include "libcockatrice/card/set/card_set.h"
-#include "libcockatrice/card/set/card_set_list.h"
-#include "libcockatrice/filters/filter_card.h"
-#include "libcockatrice/utility/macros.h"
 #include "visual_database_display_filter_button.h"
 
-#include <QAbstractItemModel>
-#include <QCheckBox>
-#include <QDateTime>
-#include <QDebug>
-#include <QHBoxLayout>
 #include <QLineEdit>
-#include <QList>
-#include <QPersistentModelIndex>
 #include <QPushButton>
-#include <QSet>
-#include <QSharedPointer>
-#include <QSpinBox>
 #include <QTimer>
-#include <QVBoxLayout>
-#include <QtGlobal>
 #include <algorithm>
-#include <compare>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/filters/filter_tree.h>
 #include <libcockatrice/settings/visual_deck_storage_settings.h>
-#include <qnamespace.h>
 
 VisualDatabaseDisplayRecentSetFilterSettingsWidget::VisualDatabaseDisplayRecentSetFilterSettingsWidget(QWidget *parent)
     : QWidget(parent)
diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.h b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.h
index 468e97e0d..bcc5e93c2 100644
--- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.h
+++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.h
@@ -7,19 +7,16 @@
 #ifndef VISUAL_DATABASE_DISPLAY_SET_FILTER_WIDGET_H
 #define VISUAL_DATABASE_DISPLAY_SET_FILTER_WIDGET_H
 
-#include <QMap>
-#include <QString>
-#include <QWidget>
-#include <qtmetamacros.h>
+#include "../../../filters/filter_tree_model.h"
+#include "../general/layout_containers/flow_widget.h"
 
-class FilterTreeModel;
-class FlowWidget;
-class QCheckBox;
-class QHBoxLayout;
-class QLineEdit;
-class QPushButton;
-class QSpinBox;
-class QVBoxLayout;
+#include <QCheckBox>
+#include <QLineEdit>
+#include <QMap>
+#include <QPushButton>
+#include <QSpinBox>
+#include <QVBoxLayout>
+#include <QWidget>
 
 class VisualDatabaseDisplayRecentSetFilterSettingsWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp
index 705bb8efa..6d4bcb58e 100644
--- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp
@@ -1,28 +1,15 @@
 #include "visual_database_display_sub_type_filter_widget.h"
 
 #include "../../../filters/filter_tree_model.h"
-#include "../general/layout_containers/flow_widget.h"
-#include "libcockatrice/card/database/card_database_querier.h"
-#include "libcockatrice/filters/filter_card.h"
 #include "visual_database_display_filter_button.h"
 
-#include <QAbstractItemModel>
-#include <QDebug>
-#include <QHBoxLayout>
 #include <QLabel>
 #include <QLineEdit>
-#include <QList>
-#include <QPersistentModelIndex>
 #include <QPushButton>
-#include <QSet>
-#include <QSharedPointer>
 #include <QSpinBox>
 #include <QTimer>
-#include <QVBoxLayout>
-#include <QtGlobal>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/filters/filter_tree.h>
-#include <qnamespace.h>
 
 VisualDatabaseDisplaySubTypeFilterWidget::VisualDatabaseDisplaySubTypeFilterWidget(QWidget *parent,
                                                                                    FilterTreeModel *_filterModel)
diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.h b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.h
index 7929063fd..d713c7f99 100644
--- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.h
+++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.h
@@ -7,18 +7,14 @@
 #ifndef VISUAL_DATABASE_DISPLAY_SUB_TYPE_FILTER_WIDGET_H
 #define VISUAL_DATABASE_DISPLAY_SUB_TYPE_FILTER_WIDGET_H
 
-#include <QMap>
-#include <QString>
-#include <QWidget>
-#include <qtmetamacros.h>
+#include "../../../filters/filter_tree_model.h"
+#include "../general/layout_containers/flow_widget.h"
 
-class FilterTreeModel;
-class FlowWidget;
-class QLabel;
-class QLineEdit;
-class QPushButton;
-class QSpinBox;
-class QVBoxLayout;
+#include <QLabel>
+#include <QMap>
+#include <QPushButton>
+#include <QSpinBox>
+#include <QWidget>
 
 class VisualDatabaseDisplaySubTypeFilterWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.cpp
index 599ac97b4..6e0fee53f 100644
--- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.cpp
@@ -3,52 +3,21 @@
 #include "../../../client/settings/cache_settings.h"
 #include "../../../filters/filter_tree_model.h"
 #include "../../../filters/syntax_help.h"
-#include "../../key_signals.h"
 #include "../../pixel_map_generator.h"
-#include "../cards/card_info_picture_widget.h"
 #include "../cards/card_info_picture_with_text_overlay_widget.h"
-#include "../cards/card_size_widget.h"
 #include "../deck_editor/card_database_view.h"
-#include "../general/layout_containers/flow_widget.h"
 #include "../utility/custom_line_edit.h"
-#include "card_database_display_model.h"
-#include "card_database_model.h"
-#include "deck_list_model.h"
-#include "libcockatrice/card/card_localization.h"
-#include "libcockatrice/card/database/card_database_loader.h"
-#include "libcockatrice/card/database/card_database_querier.h"
-#include "libcockatrice/card/printing/exact_card.h"
-#include "libcockatrice/card/printing/printing_info.h"
-#include "libcockatrice/filters/filter_card.h"
-#include "libcockatrice/filters/filter_tree.h"
 #include "visual_database_display_color_filter_widget.h"
-#include "visual_database_display_filter_toolbar_widget.h"
+#include "visual_database_display_filter_save_load_widget.h"
+#include "visual_database_display_main_type_filter_widget.h"
+#include "visual_database_display_name_filter_widget.h"
+#include "visual_database_display_set_filter_widget.h"
+#include "visual_database_display_sub_type_filter_widget.h"
 
-#include <QAbstractItemModel>
-#include <QAction>
-#include <QDebug>
-#include <QIcon>
-#include <QLabel>
-#include <QLineEdit>
-#include <QList>
-#include <QMessageLogger>
-#include <QModelIndex>
-#include <QPair>
-#include <QPersistentModelIndex>
-#include <QPushButton>
-#include <QScrollArea>
+#include <QHeaderView>
 #include <QScrollBar>
-#include <QSharedPointer>
-#include <QSizePolicy>
-#include <QSlider>
-#include <QStringLiteral>
+#include <QShowEvent>
 #include <QStyledItemDelegate>
-#include <QTimer>
-#include <QToolButton>
-#include <QVBoxLayout>
-#include <QVariant>
-#include <QtGlobal>
-#include <algorithm>
 #include <libcockatrice/card/card_info_comparator.h>
 #include <libcockatrice/card/database/card_database.h>
 #include <libcockatrice/card/database/card_database_manager.h>
@@ -56,8 +25,6 @@
 #include <libcockatrice/settings/cards_display_settings.h>
 #include <utility>
 
-class QMouseEvent;
-
 VisualDatabaseDisplayWidget::VisualDatabaseDisplayWidget(QWidget *parent,
                                                          CardDatabaseModel *database_model,
                                                          DeckListModel *deckListModel)
diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.h b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.h
index 9771e55c1..d161ce362 100644
--- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.h
+++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.h
@@ -7,38 +7,25 @@
 #ifndef VISUAL_DATABASE_DISPLAY_WIDGET_H
 #define VISUAL_DATABASE_DISPLAY_WIDGET_H
 
-#include "libcockatrice/card/card_info.h"
+#include "../../../filters/filter_tree_model.h"
+#include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
+#include "../../key_signals.h"
+#include "../cards/card_info_picture_with_text_overlay_widget.h"
+#include "../cards/card_size_widget.h"
+#include "../general/layout_containers/flow_widget.h"
+#include "../general/layout_containers/overlap_control_widget.h"
+#include "../utility/custom_line_edit.h"
+#include "visual_database_display_color_filter_widget.h"
+#include "visual_database_display_filter_toolbar_widget.h"
 
 #include <QLoggingCategory>
-#include <QMouseEvent>
-#include <QString>
-#include <QStringList>
+#include <QVBoxLayout>
+#include <QWheelEvent>
 #include <QWidget>
 #include <functional>
-#include <qnamespace.h>
-#include <qtmetamacros.h>
-
-class CardDatabaseDisplayModel;
-class CardDatabaseModel;
-class CardDatabaseView;
-class CardSizeWidget;
-class DeckList;
-class DeckListModel;
-class ExactCard;
-class FilterTreeModel;
-class FlowWidget;
-class OverlapControlWidget;
-class QLabel;
-class QModelIndex;
-class QPushButton;
-class QScrollArea;
-class QTimer;
-class QToolButton;
-class QVBoxLayout;
-class SearchLineEdit;
-class VisualDatabaseDisplayColorFilterWidget;
-class VisualDatabaseDisplayFilterToolbarWidget;
-template <typename T> class QList;
+#include <libcockatrice/models/database/card_database_model.h>
+#include <libcockatrice/models/deck_list/deck_list_model.h>
+#include <qscrollarea.h>
 
 inline Q_LOGGING_CATEGORY(VisualDatabaseDisplayLog, "visual_database_display");
 
diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp
index 0f6ac51ec..bb5b333d9 100644
--- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp
@@ -2,18 +2,13 @@
 
 #include "../../../client/settings/cache_settings.h"
 
-#include <QChar>
 #include <QDir>
 #include <QFile>
 #include <QFontMetrics>
 #include <QHBoxLayout>
 #include <QMessageBox>
-#include <QMouseEvent>
 #include <QPushButton>
-#include <QSize>
-#include <QSizePolicy>
 #include <libcockatrice/settings/paths_settings.h>
-#include <qnamespace.h>
 
 FilterDisplayWidget::FilterDisplayWidget(QWidget *parent, const QString &filename, FilterTreeModel *_filterModel)
     : QWidget(parent), filterFilename(filename), filterModel(_filterModel)
diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_filter_display_widget.h b/cockatrice/src/interface/widgets/visual_database_display/visual_database_filter_display_widget.h
index 6d051bcf7..5fe29fa2d 100644
--- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_filter_display_widget.h
+++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_filter_display_widget.h
@@ -7,12 +7,12 @@
 #ifndef VISUAL_DATABASE_FILTER_DISPLAY_WIDGET_H
 #define VISUAL_DATABASE_FILTER_DISPLAY_WIDGET_H
 
+#include <QMouseEvent>
+#include <QPushButton>
 #include <QString>
 #include <QWidget>
-#include <qtmetamacros.h>
 
 class FilterTreeModel;
-class QPushButton;
 
 class FilterDisplayWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp
index 25ba41aa9..28abe480e 100644
--- a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp
@@ -1,27 +1,9 @@
 #include "visual_deck_display_options_widget.h"
 
 #include "../../pixel_map_generator.h"
-#include "../deck_editor/deck_editor_deck_dock_widget.h"
-#include "../quick_settings/settings_button_widget.h"
 #include "../tabs/visual_deck_editor/tab_deck_editor_visual.h"
-#include "../utility/compact_push_button.h"
-#include "deck_list_model.h"
 
-#include <QAbstractItemModel>
-#include <QAbstractItemView>
-#include <QComboBox>
-#include <QFlags>
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QListWidget>
-#include <QListWidgetItem>
-#include <QPushButton>
-#include <QSize>
-#include <QSizePolicy>
-#include <QStringLiteral>
-#include <QtGlobal>
 #include <libcockatrice/utility/qt_utils.h>
-#include <qnamespace.h>
 
 VisualDeckDisplayOptionsWidget::VisualDeckDisplayOptionsWidget(QWidget *parent) : QWidget(parent)
 {
diff --git a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.h b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.h
index 96600c587..bc11884df 100644
--- a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.h
+++ b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.h
@@ -3,18 +3,12 @@
 
 #include "visual_deck_editor_widget.h"
 
-#include <QList>
-#include <QString>
-#include <QStringList>
+#include <QComboBox>
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QListWidget>
+#include <QPushButton>
 #include <QWidget>
-#include <qtmetamacros.h>
-
-class CompactPushButton;
-class QComboBox;
-class QHBoxLayout;
-class QLabel;
-class QListWidget;
-class SettingsButtonWidget;
 
 /**
  * @class VisualDeckDisplayOptionsWidget
diff --git a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.cpp
index 76c3d0908..da4fe09e5 100644
--- a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.cpp
@@ -1,9 +1,5 @@
 #include "visual_deck_editor_placeholder_widget.h"
 
-#include <QLabel>
-#include <QVBoxLayout>
-#include <qnamespace.h>
-
 VisualDeckEditorPlaceholderWidget::VisualDeckEditorPlaceholderWidget(QWidget *parent) : QWidget(parent)
 {
     mainLayout = new QVBoxLayout(this);
diff --git a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.h b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.h
index 84a3142d8..de2362a81 100644
--- a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.h
+++ b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.h
@@ -1,11 +1,9 @@
 #ifndef COCKATRICE_VISUAL_DECK_EDITOR_PLACEHOLDER_WIDGET_H
 #define COCKATRICE_VISUAL_DECK_EDITOR_PLACEHOLDER_WIDGET_H
 
+#include <QLabel>
+#include <QVBoxLayout>
 #include <QWidget>
-#include <qtmetamacros.h>
-
-class QLabel;
-class QVBoxLayout;
 
 class VisualDeckEditorPlaceholderWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp
index 1554dceb8..cee268228 100644
--- a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp
@@ -1,37 +1,16 @@
 #include "visual_deck_editor_sample_hand_widget.h"
 
 #include "../../../client/settings/cache_settings.h"
+#include "../../deck_loader/deck_loader.h"
 #include "../cards/card_info_picture_widget.h"
-#include "../cards/card_size_widget.h"
 #include "../deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.h"
-#include "../general/layout_containers/flow_widget.h"
-#include "deck_list_model.h"
-#include "libcockatrice/card/card_info.h"
-#include "libcockatrice/card/database/card_database_querier.h"
-#include "libcockatrice/deck_list/tree/deck_list_card_node.h"
-#include "libcockatrice/deck_list/tree/inner_deck_list_node.h"
+#include "../deck_analytics/deck_list_statistics_analyzer.h"
 
-#include <QDebug>
-#include <QHBoxLayout>
-#include <QPushButton>
-#include <QSharedPointer>
-#include <QSlider>
-#include <QSpinBox>
 #include <QSplitter>
-#include <QString>
-#include <QVBoxLayout>
-#include <QtGlobal>
-#include <algorithm>
-#include <compare>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/settings/cards_display_settings.h>
-#include <qlogging.h>
-#include <qnamespace.h>
-#include <qobjectdefs.h>
 #include <random>
 
-class DeckListStatisticsAnalyzer;
-
 VisualDeckEditorSampleHandWidget::VisualDeckEditorSampleHandWidget(QWidget *parent,
                                                                    DeckListModel *_deckListModel,
                                                                    DeckListStatisticsAnalyzer *_statsAnalyzer)
diff --git a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.h b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.h
index 16f343b75..c6c07dd55 100644
--- a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.h
+++ b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.h
@@ -7,22 +7,16 @@
 #ifndef VISUAL_DECK_EDITOR_SAMPLE_HAND_WIDGET_H
 #define VISUAL_DECK_EDITOR_SAMPLE_HAND_WIDGET_H
 
-#include "libcockatrice/card/printing/exact_card.h"
+#include "../cards/card_size_widget.h"
+#include "../deck_analytics/deck_list_statistics_analyzer.h"
+#include "../general/layout_containers/flow_widget.h"
 
-#include <QList>
+#include <QPushButton>
+#include <QSpinBox>
 #include <QWidget>
-#include <qtmetamacros.h>
+#include <libcockatrice/models/deck_list/deck_list_model.h>
 
 class DrawProbabilityWidget;
-class CardSizeWidget;
-class DeckListModel;
-class DeckListStatisticsAnalyzer;
-class FlowWidget;
-class QHBoxLayout;
-class QPushButton;
-class QSpinBox;
-class QVBoxLayout;
-
 class VisualDeckEditorSampleHandWidget : public QWidget
 {
     Q_OBJECT
diff --git a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp
index 74b940586..60e354d6e 100644
--- a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp
@@ -1,48 +1,33 @@
 #include "visual_deck_editor_widget.h"
 
 #include "../../../client/settings/cache_settings.h"
+#include "../../../main.h"
+#include "../../deck_loader/deck_loader.h"
+#include "../../layouts/overlap_layout.h"
 #include "../../pixel_map_generator.h"
-#include "../cards/card_size_widget.h"
+#include "../cards/card_info_picture_with_text_overlay_widget.h"
 #include "../cards/deck_card_zone_display_widget.h"
 #include "../general/layout_containers/flow_widget.h"
+#include "../tabs/visual_deck_editor/tab_deck_editor_visual.h"
+#include "../tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.h"
 #include "../utility/compact_push_button.h"
 #include "../utility/completer_utils.h"
-#include "card/card_completer_proxy_model.h"
-#include "card_database_display_model.h"
-#include "libcockatrice/card/database/card_database_querier.h"
-#include "libcockatrice/card/printing/exact_card.h"
 #include "visual_deck_display_options_widget.h"
-#include "visual_deck_editor_placeholder_widget.h"
 
-#include <QAbstractItemModel>
-#include <QAbstractItemView>
+#include <QCheckBox>
 #include <QCompleter>
-#include <QDebug>
 #include <QHBoxLayout>
-#include <QItemSelection>
-#include <QItemSelectionModel>
-#include <QItemSelectionRange>
-#include <QLayout>
 #include <QLineEdit>
-#include <QList>
-#include <QModelIndex>
 #include <QPushButton>
-#include <QRegularExpression>
-#include <QScrollArea>
-#include <QSharedPointer>
-#include <QSize>
-#include <QSizePolicy>
-#include <QSortFilterProxyModel>
-#include <QStringLiteral>
+#include <QResizeEvent>
 #include <QTimer>
-#include <QVBoxLayout>
-#include <QVariant>
-#include <QtGlobal>
+#include <libcockatrice/card/card_info_comparator.h>
+#include <libcockatrice/card/database/card_database.h>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/models/database/card_database_model.h>
 #include <libcockatrice/models/deck_list/deck_list_model.h>
 #include <libcockatrice/settings/cards_display_settings.h>
-#include <qnamespace.h>
+#include <qscrollarea.h>
 
 VisualDeckEditorWidget::VisualDeckEditorWidget(QWidget *parent,
                                                DeckListModel *_deckListModel,
diff --git a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.h b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.h
index 0b8ff19fb..cc045fca2 100644
--- a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.h
+++ b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.h
@@ -7,35 +7,26 @@
 #ifndef VISUAL_DECK_EDITOR_H
 #define VISUAL_DECK_EDITOR_H
 
-#include <QHash>
-#include <QMouseEvent>
-#include <QPersistentModelIndex>
-#include <QString>
-#include <QStringList>
+#include "../cards/card_info_picture_with_text_overlay_widget.h"
+#include "../cards/card_size_widget.h"
+#include "../general/layout_containers/overlap_control_widget.h"
+#include "../quick_settings/settings_button_widget.h"
+#include "../utility/compact_push_button.h"
+#include "visual_deck_editor_placeholder_widget.h"
+
+#include <QCheckBox>
+#include <QListWidget>
+#include <QPushButton>
 #include <QWidget>
-#include <qtmetamacros.h>
+#include <libcockatrice/card/database/card_database.h>
+#include <libcockatrice/models/database/card/card_completer_proxy_model.h>
+#include <libcockatrice/models/database/card_database_display_model.h>
+#include <libcockatrice/models/database/card_database_model.h>
+#include <libcockatrice/models/deck_list/deck_list_model.h>
+#include <qscrollarea.h>
 
 class VisualDeckDisplayOptionsWidget;
 class DeckCardZoneDisplayWidget;
-class CardCompleterProxyModel;
-class CardDatabaseDisplayModel;
-class CardDatabaseModel;
-class CardSizeWidget;
-class CompactPushButton;
-class DeckList;
-class DeckListModel;
-class ExactCard;
-class FlowWidget;
-class QCompleter;
-class QHBoxLayout;
-class QItemSelection;
-class QItemSelectionModel;
-class QLineEdit;
-class QModelIndex;
-class QScrollArea;
-class QVBoxLayout;
-class VisualDeckEditorPlaceholderWidget;
-
 enum class DisplayType
 {
     Flat,
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp
index 1ac4c856c..d1a780c38 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp
@@ -1,13 +1,8 @@
 #include "deck_preview_color_identity_filter_widget.h"
 
 #include "../../cards/additional_info/mana_symbol_widget.h"
-#include "../visual_deck_storage_sort_filter_proxy_model.h"
 
-#include <QHBoxLayout>
-#include <QPushButton>
 #include <QSet>
-#include <QSharedPointer>
-#include <QString>
 
 DeckPreviewColorIdentityFilterWidget::DeckPreviewColorIdentityFilterWidget(QWidget *parent)
     : QWidget(parent), layout(new QHBoxLayout(this))
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.h
index e0c90034c..d54984bcf 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.h
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.h
@@ -8,14 +8,11 @@
 
 #include "../visual_deck_storage_sort_filter_proxy_model.h"
 
-#include <QChar>
+#include <QHBoxLayout>
 #include <QMap>
+#include <QPushButton>
 #include <QSet>
 #include <QWidget>
-#include <qtmetamacros.h>
-
-class QHBoxLayout;
-class QPushButton;
 
 class DeckPreviewColorIdentityFilterWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp
index dc619e9fa..41d87ccb1 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp
@@ -1,23 +1,15 @@
 #include "deck_preview_deck_tags_display_widget.h"
 
 #include "../../../../client/settings/cache_settings.h"
-#include "../../../deck_loader/deck_file_format.h"
 #include "../../../deck_loader/deck_loader.h"
-#include "../../../deck_loader/loaded_deck.h"
 #include "../../general/layout_containers/flow_widget.h"
 #include "deck_preview_tag_addition_widget.h"
 #include "deck_preview_tag_dialog.h"
 #include "deck_preview_tag_display_widget.h"
-#include "libcockatrice/deck_list/deck_list.h"
 
-#include <QDialog>
-#include <QDir>
 #include <QDirIterator>
 #include <QHBoxLayout>
-#include <QSizePolicy>
 #include <libcockatrice/settings/paths_settings.h>
-#include <optional>
-#include <qnamespace.h>
 
 DeckPreviewDeckTagsDisplayWidget::DeckPreviewDeckTagsDisplayWidget(QWidget *_parent, const QStringList &_tags)
     : QWidget(_parent), currentTags(_tags)
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h
index a12f6ec3c..64bd5aa1a 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h
@@ -6,12 +6,9 @@
 #ifndef DECK_PREVIEW_DECK_TAGS_DISPLAY_WIDGET_H
 #define DECK_PREVIEW_DECK_TAGS_DISPLAY_WIDGET_H
 
-#include <QList>
-#include <QString>
 #include <QStringList>
 #include <QWidget>
 #include <functional>
-#include <qtmetamacros.h>
 
 class FlowWidget;
 
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.cpp
index 82ed6191c..fdf4b2a28 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.cpp
@@ -1,19 +1,12 @@
 #include "deck_preview_tag_addition_widget.h"
 
-#include <QBrush>
-#include <QColor>
-#include <QFlags>
-#include <QFont>
+#include "../../../../client/settings/cache_settings.h"
+#include "../../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
+
 #include <QFontMetrics>
 #include <QHBoxLayout>
 #include <QMouseEvent>
 #include <QPainter>
-#include <QPen>
-#include <QRect>
-#include <QSize>
-#include <QSizePolicy>
-#include <algorithm>
-#include <qnamespace.h>
 #include <utility>
 
 DeckPreviewTagAdditionWidget::DeckPreviewTagAdditionWidget(QWidget *_parent, QString _tagName)
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.h
index 30ce46249..7a3a735a2 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.h
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.h
@@ -7,9 +7,7 @@
 #ifndef DECK_PREVIEW_TAG_ADDITION_WIDGET_H
 #define DECK_PREVIEW_TAG_ADDITION_WIDGET_H
 
-#include <QString>
-#include <QWidget>
-#include <qtmetamacros.h>
+#include "deck_preview_deck_tags_display_widget.h"
 
 class DeckPreviewTagAdditionWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp
index 2a6a42e9d..f27d11d36 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp
@@ -8,17 +8,10 @@
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QLineEdit>
-#include <QListWidget>
-#include <QListWidgetItem>
 #include <QMessageBox>
-#include <QObject>
 #include <QPushButton>
-#include <QSharedPointer>
 #include <QTimer>
-#include <QVBoxLayout>
-#include <QWidget>
 #include <libcockatrice/settings/visual_deck_storage_settings.h>
-#include <qnamespace.h>
 
 DeckPreviewTagDialog::DeckPreviewTagDialog(const QStringList &knownTags,
                                            const QStringList &_activeTags,
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.h b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.h
index 80d5560a0..4d9040af4 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.h
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.h
@@ -9,18 +9,10 @@
 #define DECK_PREVIEW_TAG_DIALOG_H
 
 #include <QDialog>
-#include <QList>
-#include <QString>
-#include <QStringList>
-#include <qtmetamacros.h>
-
-class QHBoxLayout;
-class QLabel;
-class QLineEdit;
-class QListWidget;
-class QPushButton;
-class QVBoxLayout;
-class QWidget;
+#include <QLabel>
+#include <QLineEdit>
+#include <QListWidget>
+#include <QVBoxLayout>
 
 class DeckPreviewTagDialog : public QDialog
 {
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_display_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_display_widget.cpp
index e62570241..a7fef5031 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_display_widget.cpp
@@ -1,19 +1,9 @@
 #include "deck_preview_tag_display_widget.h"
 
-#include <QBrush>
-#include <QColor>
-#include <QFlags>
-#include <QFont>
 #include <QFontMetrics>
 #include <QHBoxLayout>
 #include <QMouseEvent>
 #include <QPainter>
-#include <QPen>
-#include <QRect>
-#include <QSize>
-#include <QSizePolicy>
-#include <algorithm>
-#include <qnamespace.h>
 
 DeckPreviewTagDisplayWidget::DeckPreviewTagDisplayWidget(QWidget *parent, const QString &_tagName)
     : QWidget(parent), tagName(_tagName), state(TagState::NotSelected)
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_display_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_display_widget.h
index d3f5e7326..df2a6b404 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_display_widget.h
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_display_widget.h
@@ -7,12 +7,10 @@
 #ifndef DECK_PREVIEW_TAG_DISPLAY_WIDGET_H
 #define DECK_PREVIEW_TAG_DISPLAY_WIDGET_H
 
+#include <QLabel>
+#include <QPushButton>
 #include <QString>
 #include <QWidget>
-#include <qtmetamacros.h>
-
-class QLabel;
-class QPushButton;
 
 enum class TagState
 {
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_item_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_item_widget.cpp
index 7796f893b..d9ea9fc30 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_item_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_item_widget.cpp
@@ -1,8 +1,5 @@
 #include "deck_preview_tag_item_widget.h"
 
-#include <QCheckBox>
-#include <QHBoxLayout>
-
 DeckPreviewTagItemWidget::DeckPreviewTagItemWidget(const QString &tagName, bool isChecked, QWidget *parent)
     : QWidget(parent), checkBox_(new QCheckBox(this))
 {
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_item_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_item_widget.h
index a09eb7501..a3301799a 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_item_widget.h
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_item_widget.h
@@ -7,11 +7,9 @@
 #ifndef DECK_PREVIEW_TAG_ITEM_WIDGET_H
 #define DECK_PREVIEW_TAG_ITEM_WIDGET_H
 
-#include <QString>
+#include <QCheckBox>
+#include <QHBoxLayout>
 #include <QWidget>
-#include <qtmetamacros.h>
-
-class QCheckBox;
 
 class DeckPreviewTagItemWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp
index 220c55788..53fe32314 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp
@@ -3,51 +3,26 @@
 #include "../../../../client/settings/cache_settings.h"
 #include "../../../../interface/widgets/dialogs/dlg_convert_deck_to_cod_format.h"
 #include "../../../deck_loader/deck_loader.h"
-#include "../../../deck_loader/loaded_deck.h"
 #include "../../cards/additional_info/color_identity_widget.h"
 #include "../../cards/deck_preview_card_picture_widget.h"
-#include "../visual_deck_storage_model.h"
 #include "../visual_deck_storage_quick_settings_widget.h"
 #include "../visual_deck_storage_tag_filter_widget.h"
 #include "../visual_deck_storage_widget.h"
 #include "deck_preview_deck_tags_display_widget.h"
-#include "libcockatrice/card/database/card_database_querier.h"
-#include "libcockatrice/card/printing/exact_card.h"
-#include "libcockatrice/deck_list/deck_list.h"
-#include "libcockatrice/deck_list/tree/deck_list_card_node.h"
-#include "libcockatrice/utility/card_ref.h"
 
-#include <QAbstractItemModel>
-#include <QAction>
-#include <QCursor>
-#include <QDebug>
 #include <QFileInfo>
 #include <QFrame>
 #include <QInputDialog>
 #include <QLabel>
-#include <QLineEdit>
 #include <QMenu>
 #include <QMessageBox>
-#include <QModelIndex>
 #include <QMouseEvent>
-#include <QPair>
-#include <QRect>
 #include <QSet>
-#include <QSharedPointer>
-#include <QSizePolicy>
-#include <QStandardItem>
 #include <QStandardItemModel>
-#include <QStringLiteral>
 #include <QVBoxLayout>
-#include <QVariant>
-#include <QtGlobal>
 #include <algorithm>
-#include <compare>
-#include <functional>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/settings/visual_deck_storage_settings.h>
-#include <qnamespace.h>
-#include <utility>
 
 DeckPreviewWidget::DeckPreviewWidget(QWidget *_parent,
                                      VisualDeckStorageWidget *_visualDeckStorageWidget,
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.h
index cdeed87c7..f4909eda8 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.h
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.h
@@ -6,18 +6,17 @@
 #ifndef DECK_PREVIEW_WIDGET_H
 #define DECK_PREVIEW_WIDGET_H
 
+#include "../../cards/deck_preview_card_picture_widget.h"
+#include "../visual_deck_storage_model.h"
+
 #include <QAbstractItemView>
-#include <QAbstractScrollArea>
 #include <QApplication>
 #include <QComboBox>
 #include <QEvent>
-#include <QList>
-#include <QObject>
-#include <QString>
-#include <QStringList>
+#include <QVBoxLayout>
 #include <QWidget>
-#include <qtmetamacros.h>
 
+class QEnterEvent;
 class QFrame;
 class QLabel;
 class QMenu;
@@ -27,8 +26,6 @@ class DeckPreviewCardPictureWidget;
 class DeckPreviewDeckTagsDisplayWidget;
 class VisualDeckStorageModel;
 class VisualDeckStorageWidget;
-class QVBoxLayout;
-struct LoadedDeck;
 
 class DeckPreviewWidget final : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/public_deck_preview_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/public_deck_preview_widget.cpp
index 361747423..b49d6f9f4 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/public_deck_preview_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/public_deck_preview_widget.cpp
@@ -4,19 +4,15 @@
 #include "../../cards/additional_info/color_identity_widget.h"
 #include "../../cards/deck_preview_card_picture_widget.h"
 #include "../../general/layout_containers/flow_widget.h"
-#include "../remote_public_decks_model.h"
 #include "deck_preview_tag_display_widget.h"
-#include "libcockatrice/card/database/card_database_querier.h"
-#include "libcockatrice/card/printing/exact_card.h"
-#include "libcockatrice/utility/card_ref.h"
 
-#include <QDateTime>
 #include <QKeyEvent>
 #include <QLabel>
+#include <QMouseEvent>
+#include <QResizeEvent>
 #include <QVBoxLayout>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/settings/visual_deck_storage_settings.h>
-#include <qnamespace.h>
 
 PublicDeckPreviewWidget::PublicDeckPreviewWidget(QWidget *parent, const RemotePublicDecksModel::DeckEntry &entry)
     : QWidget(parent)
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/public_deck_preview_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/public_deck_preview_widget.h
index 103120c7f..a0e5dd43a 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/public_deck_preview_widget.h
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/public_deck_preview_widget.h
@@ -9,15 +9,16 @@
 #include "../remote_public_decks_model.h"
 
 #include <QList>
-#include <QMouseEvent>
 #include <QString>
 #include <QWidget>
-#include <qtmetamacros.h>
 
 class ColorIdentityWidget;
 class DeckPreviewCardPictureWidget;
 class FlowWidget;
+class QKeyEvent;
 class QLabel;
+class QMouseEvent;
+class QResizeEvent;
 
 /**
  * @brief A preview tile for a public deck published by another user.
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/remote_public_decks_model.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/remote_public_decks_model.cpp
index 9b8daf87c..a1cabd729 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/remote_public_decks_model.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/remote_public_decks_model.cpp
@@ -3,10 +3,7 @@
 #include "../../../client/settings/cache_settings.h"
 
 #include <QTimer>
-#include <QVariant>
-#include <QtGlobal>
 #include <algorithm>
-#include <google/protobuf/repeated_ptr_field.h>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/command_deck_list_other_user.pb.h>
 #include <libcockatrice/protocol/pb/response.pb.h>
@@ -14,9 +11,6 @@
 #include <libcockatrice/protocol/pb/serverinfo_deckstorage.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
 #include <libcockatrice/settings/network_settings.h>
-#include <string>
-
-class QObject;
 
 RemotePublicDecksModel::RemotePublicDecksModel(AbstractClient *_client, QObject *parent)
     : QAbstractListModel(parent), client(_client)
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/remote_public_decks_model.h b/cockatrice/src/interface/widgets/visual_deck_storage/remote_public_decks_model.h
index cb1f786e4..eeb606442 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/remote_public_decks_model.h
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/remote_public_decks_model.h
@@ -9,15 +9,10 @@
 #include "visual_deck_storage_sort_filter_proxy_model.h"
 
 #include <QAbstractListModel>
-#include <QChar>
 #include <QDateTime>
 #include <QList>
-#include <QModelIndex>
 #include <QSet>
-#include <QString>
 #include <QStringList>
-#include <qnamespace.h>
-#include <qtmetamacros.h>
 
 class AbstractClient;
 class CommandContainer;
@@ -25,7 +20,6 @@ class QTimer;
 class Response;
 class ServerInfo_DeckStorage_Folder;
 class ServerInfo_DeckStorage_TreeItem;
-class QObject;
 
 /**
  * @brief Flat, read-only list of the public decks published by another user.
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp
index 44b7a1a06..53f21d1a1 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp
@@ -2,7 +2,6 @@
 
 #include "../cards/card_info_picture_widget.h"
 #include "../cards/card_size_widget.h"
-#include "../cards/deck_preview_card_picture_widget.h"
 #include "../general/display/banner_widget.h"
 #include "../general/layout_containers/flow_widget.h"
 #include "deck_preview/deck_preview_widget.h"
@@ -11,20 +10,10 @@
 #include "visual_deck_storage_sort_filter_proxy_model.h"
 #include "visual_deck_storage_widget.h"
 
-#include <QAbstractItemModel>
-#include <QChar>
-#include <QDebug>
 #include <QElapsedTimer>
-#include <QMetaObject>
-#include <QMetaType>
-#include <QModelIndex>
-#include <QPersistentModelIndex>
 #include <QSet>
-#include <QSharedPointer>
 #include <QTimer>
 #include <QVBoxLayout>
-#include <QVariant>
-#include <qnamespace.h>
 
 VisualDeckStorageFolderDisplayWidget::VisualDeckStorageFolderDisplayWidget(
     QWidget *parent,
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.h
index 998619c0b..5a81457b0 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.h
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.h
@@ -17,12 +17,9 @@
 #define VISUAL_DECK_STORAGE_FOLDER_DISPLAY_WIDGET_H
 
 #include <QHash>
-#include <QList>
 #include <QSet>
 #include <QString>
-#include <QStringList>
 #include <QWidget>
-#include <qtmetamacros.h>
 
 class BannerWidget;
 class DeckPreviewWidget;
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_model.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_model.cpp
index e84631e52..daca55fc8 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_model.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_model.cpp
@@ -1,32 +1,19 @@
 #include "visual_deck_storage_model.h"
 
-#include "../../deck_loader/deck_file_format.h"
 #include "../../deck_loader/deck_loader.h"
-#include "../../deck_loader/loaded_deck.h"
 #include "../cards/additional_info/deck_color_identity.h"
-#include "libcockatrice/deck_list/deck_list.h"
 
-#include <QChar>
 #include <QDir>
 #include <QDirIterator>
 #include <QElapsedTimer>
 #include <QFile>
 #include <QFileInfo>
 #include <QFutureWatcher>
-#include <QMetaObject>
-#include <QMetaType>
 #include <QSet>
-#include <QSharedPointer>
-#include <QVariant>
 #include <QtConcurrentRun>
-#include <compare>
 #include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/utility/card_ref.h>
-#include <optional>
 #include <utility>
 
-class QObject;
-
 namespace
 {
 /**
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_model.h b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_model.h
index 57eaebacf..330205356 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_model.h
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_model.h
@@ -14,20 +14,14 @@
 #define VISUAL_DECK_STORAGE_MODEL_H
 
 #include "../../deck_loader/loaded_deck.h"
-#include "libcockatrice/utility/card_ref.h"
 
 #include <QAbstractListModel>
 #include <QDateTime>
 #include <QHash>
 #include <QList>
-#include <QModelIndex>
-#include <QString>
 #include <QStringList>
-#include <QVector>
-#include <qnamespace.h>
-#include <qtmetamacros.h>
-
-class QObject;
+#include <libcockatrice/deck_list/deck_list.h>
+#include <optional>
 
 namespace VisualDeckStorageRoles
 {
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp
index 9bb6e0fae..c19ac0fec 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp
@@ -2,23 +2,14 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../cards/card_size_widget.h"
-#include "../quick_settings/settings_button_widget.h"
-#include "libcockatrice/utility/macros.h"
+#include "visual_deck_storage_widget.h"
 
 #include <QCheckBox>
 #include <QComboBox>
-#include <QDebug>
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QSlider>
 #include <QSpinBox>
-#include <QVariant>
-#include <QWidget>
-#include <QtGlobal>
 #include <libcockatrice/settings/cards_display_settings.h>
 #include <libcockatrice/settings/personal_settings.h>
 #include <libcockatrice/settings/visual_deck_storage_settings.h>
-#include <qnamespace.h>
 
 VisualDeckStorageQuickSettingsWidget::VisualDeckStorageQuickSettingsWidget(QWidget *parent)
     : SettingsButtonWidget(parent)
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.h
index 7bce34d8c..a85e9e654 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.h
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.h
@@ -11,14 +11,11 @@
 
 #include "../quick_settings/settings_button_widget.h"
 
-#include <qtmetamacros.h>
-
 class CardSizeWidget;
 class QLabel;
 class QSpinBox;
 class QCheckBox;
 class QComboBox;
-class QWidget;
 
 class VisualDeckStorageQuickSettingsWidget : public SettingsButtonWidget
 {
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp
index 2c03666c1..406527893 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp
@@ -4,10 +4,6 @@
 #include "../../pixel_map_generator.h"
 
 #include <QAction>
-#include <QHBoxLayout>
-#include <QIcon>
-#include <QLineEdit>
-#include <QStringLiteral>
 #include <QTimer>
 
 /**
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.h
index 87a8dc9f8..7769ea911 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.h
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.h
@@ -6,13 +6,11 @@
 #ifndef VISUAL_DECK_STORAGE_SEARCH_WIDGET_H
 #define VISUAL_DECK_STORAGE_SEARCH_WIDGET_H
 
-#include <QString>
+#include <QHBoxLayout>
+#include <QLineEdit>
 #include <QWidget>
-#include <qtmetamacros.h>
 
 class QTimer;
-class QHBoxLayout;
-class QLineEdit;
 
 class VisualDeckStorageSearchWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_filter_proxy_model.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_filter_proxy_model.cpp
index abe3327af..0ad6ebcb2 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_filter_proxy_model.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_filter_proxy_model.cpp
@@ -1,20 +1,10 @@
 #include "visual_deck_storage_sort_filter_proxy_model.h"
 
 #include "../../../client/settings/cache_settings.h"
-#include "../../deck_loader/loaded_deck.h"
 #include "../../filters/deck_filter_string.h"
-#include "visual_deck_storage_model.h"
 
-#include <QAbstractItemModel>
-#include <QDateTime>
 #include <QFileInfo>
-#include <QModelIndex>
-#include <QObject>
-#include <QSharedPointer>
-#include <QStringList>
-#include <QVariant>
 #include <algorithm>
-#include <compare>
 #include <libcockatrice/card/card_localization.h>
 #include <libcockatrice/settings/cards_display_settings.h>
 
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_filter_proxy_model.h b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_filter_proxy_model.h
index 51732adc8..a6c40a2d7 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_filter_proxy_model.h
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_filter_proxy_model.h
@@ -15,15 +15,11 @@
 #ifndef VISUAL_DECK_STORAGE_SORT_FILTER_PROXY_MODEL_H
 #define VISUAL_DECK_STORAGE_SORT_FILTER_PROXY_MODEL_H
 
-#include <QChar>
-#include <QList>
+#include "visual_deck_storage_model.h"
+
 #include <QSet>
 #include <QSortFilterProxyModel>
 #include <QString>
-#include <qtmetamacros.h>
-
-class QObject;
-class VisualDeckStorageModel;
 
 class VisualDeckStorageSortFilterProxyModel : public QSortFilterProxyModel
 {
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp
index f798a72a9..6289a4941 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp
@@ -3,9 +3,6 @@
 #include "../../../client/settings/cache_settings.h"
 #include "visual_deck_storage_widget.h"
 
-#include <QComboBox>
-#include <QHBoxLayout>
-#include <QtGlobal>
 #include <libcockatrice/settings/visual_deck_storage_settings.h>
 
 VisualDeckStorageSortWidget::VisualDeckStorageSortWidget(VisualDeckStorageWidget *parent) : QWidget(parent)
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.h
index df3f39eb5..633924d84 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.h
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.h
@@ -8,13 +8,11 @@
 
 #include "visual_deck_storage_sort_filter_proxy_model.h"
 
+#include <QComboBox>
+#include <QHBoxLayout>
 #include <QWidget>
-#include <qtmetamacros.h>
 
 class VisualDeckStorageWidget;
-class QComboBox;
-class QHBoxLayout;
-
 class VisualDeckStorageSortWidget : public QWidget
 {
     Q_OBJECT
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_tag_filter_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_tag_filter_widget.cpp
index d6b7aedbb..6f954b01b 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_tag_filter_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_tag_filter_widget.cpp
@@ -4,13 +4,6 @@
 #include "deck_preview/deck_preview_tag_display_widget.h"
 
 #include <QHBoxLayout>
-#include <QSet>
-#include <QSharedPointer>
-#include <QSizePolicy>
-#include <QString>
-#include <algorithm>
-#include <compare>
-#include <qnamespace.h>
 
 VisualDeckStorageTagFilterWidget::VisualDeckStorageTagFilterWidget(QWidget *parent) : QWidget(parent)
 {
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_tag_filter_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_tag_filter_widget.h
index 13a27c10a..5e3cb398c 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_tag_filter_widget.h
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_tag_filter_widget.h
@@ -6,16 +6,13 @@
 #ifndef VISUAL_DECK_STORAGE_TAG_FILTER_WIDGET_H
 #define VISUAL_DECK_STORAGE_TAG_FILTER_WIDGET_H
 
-#include <QList>
+#include <QSet>
 #include <QStringList>
 #include <QWidget>
 #include <functional>
-#include <qtmetamacros.h>
 
 class DeckPreviewTagDisplayWidget;
 class FlowWidget;
-class QString;
-template <class T> class QSet;
 
 class VisualDeckStorageTagFilterWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp
index 51e9c70e7..c7218f195 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp
@@ -2,38 +2,22 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../pixel_map_generator.h"
+#include "../quick_settings/settings_button_widget.h"
 #include "deck_preview/deck_preview_color_identity_filter_widget.h"
 #include "deck_preview/deck_preview_widget.h"
-#include "libcockatrice/card/database/card_database.h"
-#include "libcockatrice/card/database/card_database_loader.h"
 #include "visual_deck_storage_folder_display_widget.h"
-#include "visual_deck_storage_model.h"
 #include "visual_deck_storage_quick_settings_widget.h"
 #include "visual_deck_storage_search_widget.h"
-#include "visual_deck_storage_sort_filter_proxy_model.h"
 #include "visual_deck_storage_sort_widget.h"
 #include "visual_deck_storage_tag_filter_widget.h"
 
-#include <QAbstractItemModel>
-#include <QChar>
-#include <QDebug>
-#include <QHBoxLayout>
 #include <QLabel>
-#include <QList>
-#include <QModelIndex>
-#include <QPushButton>
-#include <QScrollArea>
-#include <QStringLiteral>
 #include <QTimer>
-#include <QToolButton>
 #include <QVBoxLayout>
-#include <QVariant>
-#include <functional>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/settings/cards_display_settings.h>
 #include <libcockatrice/settings/paths_settings.h>
 #include <libcockatrice/settings/visual_deck_storage_settings.h>
-#include <qnamespace.h>
 
 VisualDeckStorageWidget::VisualDeckStorageWidget(QWidget *parent) : QWidget(parent)
 {
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.h
index b512dd87c..dfb715bea 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.h
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.h
@@ -6,13 +6,18 @@
 #ifndef VISUAL_DECK_STORAGE_WIDGET_H
 #define VISUAL_DECK_STORAGE_WIDGET_H
 
-#include <QSet>
-#include <QString>
-#include <QStringList>
+#include "visual_deck_storage_model.h"
+#include "visual_deck_storage_sort_filter_proxy_model.h"
+
+#include <QHBoxLayout>
+#include <QScrollArea>
+#include <QToolButton>
+#include <QVBoxLayout>
 #include <QWidget>
-#include <qtmetamacros.h>
 
 class QLabel;
+class QResizeEvent;
+class QShowEvent;
 class QTimer;
 class DeckPreviewColorIdentityFilterWidget;
 class VisualDeckStorageFolderDisplayWidget;
@@ -20,13 +25,6 @@ class VisualDeckStorageQuickSettingsWidget;
 class VisualDeckStorageSearchWidget;
 class VisualDeckStorageSortWidget;
 class VisualDeckStorageTagFilterWidget;
-class QHBoxLayout;
-class QScrollArea;
-class QToolButton;
-class QVBoxLayout;
-class VisualDeckStorageModel;
-class VisualDeckStorageSortFilterProxyModel;
-struct LoadedDeck;
 
 class VisualDeckStorageWidget final : public QWidget
 {
diff --git a/cockatrice/src/interface/window_main.cpp b/cockatrice/src/interface/window_main.cpp
index 815cec1d2..77cc85130 100644
--- a/cockatrice/src/interface/window_main.cpp
+++ b/cockatrice/src/interface/window_main.cpp
@@ -21,6 +21,7 @@
 
 #include "../client/latency_status_widget.h"
 #include "../client/network/update/client/client_update_checker.h"
+#include "../client/network/update/client/release_channel.h"
 #include "../client/settings/cache_settings.h"
 #include "../client/settings/shortcuts_settings.h"
 #include "../interface/widgets/dialogs/dlg_edit_tokens.h"
@@ -33,69 +34,50 @@
 #include "../interface/widgets/dialogs/dlg_view_log.h"
 #include "../interface/widgets/onboarding/first_run_wizard.h"
 #include "../interface/widgets/settings_page/general_settings_page.h"
+#include "../interface/widgets/tabs/tab_game.h"
 #include "../interface/widgets/tabs/tab_server.h"
 #include "../interface/widgets/tabs/tab_supervisor.h"
 #include "../main.h"
-#include "abstract_client.h"
-#include "card_database_update/card_database_update_status_bar.h"
-#include "card_database_update/card_update_progress.h"
 #include "intents/contexts/context_connect_to_server.h"
 #include "intents/contexts/context_join_room.h"
-#include "intents/intent.h"
 #include "intents/intent_connect_to_server.h"
 #include "intents/intent_login.h"
 #include "intents/intent_open_server_room_by_name.h"
 #include "intents/url_parser.h"
-#include "latency_tracker.h"
 #include "logger.h"
 #include "pixel_map_generator.h"
 #include "version_string.h"
 #include "widgets/dialogs/dlg_connect.h"
 #include "widgets/server/handle_public_servers.h"
-#include "widgets/settings_page/abstract_settings_page.h"
 #include "widgets/tabs/api/commander_spellbook/handle_commander_brackets.h"
+#include "widgets/utility/get_text_with_max.h"
 
 #include <QAction>
 #include <QApplication>
 #include <QButtonGroup>
-#include <QCheckBox>
 #include <QCloseEvent>
-#include <QCoreApplication>
 #include <QDateTime>
-#include <QDebug>
 #include <QDesktopServices>
-#include <QDialog>
-#include <QEvent>
 #include <QFile>
 #include <QFileDialog>
-#include <QFileInfo>
-#include <QFlags>
-#include <QFutureWatcher>
-#include <QIODevice>
-#include <QLocalSocket>
+#include <QLabel>
 #include <QMenu>
 #include <QMenuBar>
 #include <QMessageBox>
-#include <QMessageLogger>
-#include <QObject>
-#include <QPixmap>
 #include <QPixmapCache>
-#include <QPushButton>
-#include <QSharedPointer>
 #include <QStatusBar>
-#include <QStringLiteral>
 #include <QSystemTrayIcon>
+#include <QThread>
 #include <QTimer>
-#include <QWidget>
-#include <QtConcurrentRun>
-#include <QtGlobal>
-#include <functional>
-#include <google/protobuf/stubs/port.h>
+#include <QWindow>
+#include <QtConcurrent>
+#include <QtNetwork>
 #include <libcockatrice/card/database/card_database.h>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/network/client/local/local_client.h>
 #include <libcockatrice/network/client/remote/remote_client.h>
 #include <libcockatrice/network/server/local/local_server.h>
+#include <libcockatrice/network/server/local/local_server_interface.h>
 #include <libcockatrice/protocol/pb/game_replay.pb.h>
 #include <libcockatrice/protocol/pb/room_commands.pb.h>
 #include <libcockatrice/settings/cache_storage_settings.h>
@@ -109,14 +91,6 @@
 #include <libcockatrice/settings/servers_settings.h>
 #include <libcockatrice/settings/tabs_settings.h>
 #include <libcockatrice/settings/updates_settings.h>
-#include <libcockatrice/utility/local_server_name.h>
-#include <memory>
-#include <qlogging.h>
-#include <qnamespace.h>
-#include <tuple>
-#include <utility>
-
-class LocalServerInterface;
 
 #define GITHUB_PAGES_URL "https://cockatrice.github.io"
 #define GITHUB_CONTRIBUTORS_URL "https://github.com/Cockatrice/Cockatrice/graphs/contributors"
@@ -581,13 +555,6 @@ MainWindow::MainWindow(QWidget *parent)
     connect(connectionController, &ConnectionController::pingStatsUpdated, latencyStatus,
             &LatencyStatusWidget::updateData);
 
-    cardUpdateStatusBar = new CardDatabaseUpdateStatusBar(this);
-    statusBar()->addPermanentWidget(cardUpdateStatusBar);
-    connect(this, &MainWindow::cardDatabaseUpdateProgress, cardUpdateStatusBar,
-            &CardDatabaseUpdateStatusBar::updateProgress);
-    connect(this, &MainWindow::cardDatabaseUpdateFinished, cardUpdateStatusBar,
-            &CardDatabaseUpdateStatusBar::updateFinished);
-
     connect(&SettingsCache::instance().shortcuts(), &ShortcutsSettings::shortCutChanged, this,
             &MainWindow::refreshShortcuts);
     refreshShortcuts();
@@ -606,45 +573,14 @@ MainWindow::MainWindow(QWidget *parent)
     QTimer::singleShot(0, this, &MainWindow::applyStartupDestination);
 }
 
-void MainWindow::warnAboutDataPathsInProgramDir()
-{
-    auto &paths = SettingsCache::instance().paths();
-    if (SettingsCache::instance().getIsPortableBuild() || paths.getAppDirWarningAcknowledged()) {
-        return;
-    }
-
-    const QStringList offenders = paths.pathsInsideDir(QCoreApplication::applicationDirPath());
-    if (offenders.isEmpty()) {
-        return;
-    }
-
-    QMessageBox box(QMessageBox::Warning, tr("Data paths inside the program directory"),
-                    tr("These paths are configured inside the Cockatrice program directory:\n\n%1\n\n"
-                       "Cockatrice keeps its own data outside the program directory by default. Files "
-                       "stored inside it can be deleted by an update or by uninstalling Cockatrice. "
-                       "Change them in the Settings dialog - most are on the General page - to keep "
-                       "them safe.")
-                        .arg(offenders.join(QLatin1Char('\n'))),
-                    QMessageBox::Ok, this);
-    box.setTextFormat(Qt::PlainText);
-    auto *dontShowAgain = new QCheckBox(tr("Don't show this again"));
-    box.setCheckBox(dontShowAgain);
-    box.exec();
-    if (dontShowAgain->isChecked()) {
-        paths.setAppDirWarningAcknowledged(true);
-    }
-}
-
 void MainWindow::startupConfigCheck()
 {
-    warnAboutDataPathsInProgramDir();
-
     const bool isCleanInstall = SettingsCache::instance().network().getClientVersion() == CLIENT_INFO_NOT_SET;
 
-    // The loader never runs checkUnknownSets() itself (see main.cpp): the
-    // front-loaded parse runs before MainWindow exists, so
-    // cardDatabaseNewSetsFound / cardDatabaseAllNewSetsEnabled would have no
-    // receivers. MainWindow owns the check after startup.
+    // checkUnknownSets() is intentionally deferred from the card database load
+    // (which runs in main() before MainWindow exists) so that
+    // cardDatabaseNewSetsFound / cardDatabaseAllNewSetsEnabled have live
+    // receivers when emitted.
     // On a clean install the onboarding wizard owns the first-run experience;
     // wait until it closes so the legacy "all sets enabled" welcome and the
     // Manage Sets dialog don't appear first.
@@ -941,15 +877,10 @@ void MainWindow::closeEvent(QCloseEvent *event)
     bClosingDown = true;
 
     if (cardUpdateProcess && cardUpdateProcess->state() != QProcess::NotRunning) {
-        const QString runningFor = cardUpdateStatusBar ? cardUpdateStatusBar->statusText() : QString();
-        const QString message = runningFor.isEmpty()
-                                    ? tr("A card database update is still running. Quitting now will cancel it.\n"
-                                         "Are you sure you want to quit?")
-                                    : tr("A card database update is still running: %1.\nQuitting now will cancel it.\n"
-                                         "Are you sure you want to quit?")
-                                          .arg(runningFor);
-        if (QMessageBox::question(this, tr("Are you sure?"), message, QMessageBox::Yes | QMessageBox::No,
-                                  QMessageBox::No) == QMessageBox::No) {
+        if (QMessageBox::question(this, tr("Are you sure?"),
+                                  tr("A card database update is still running. Quitting now will cancel it.\n"
+                                     "Are you sure you want to quit?"),
+                                  QMessageBox::Yes | QMessageBox::No, QMessageBox::No) == QMessageBox::No) {
             event->ignore();
             bClosingDown = false;
             return;
@@ -1138,35 +1069,18 @@ void MainWindow::cardDatabaseNewSetsFound(int numUnknownSets, QStringList unknow
 
 void MainWindow::cardDatabaseAllNewSetsEnabled()
 {
-    auto *cardDatabase = CardDatabaseManager::getInstance();
-
-    // With no card data there is nothing to have enabled and nothing to reparse.
-    if (cardDatabase->getCardList().isEmpty()) {
+    if (firstRunWizardActive || CardDatabaseManager::getInstance()->getCardList().isEmpty()) {
+        // The onboarding wizard owns the first-run messaging on a clean install,
+        // and with no card data there are no sets to have enabled.
         return;
     }
 
-    // checkUnknownSets() enabled every set after the database had already been
-    // parsed under the (empty) first-run enablement, so the parser dropped every
-    // printing of every set. Reparse now that the sets are enabled, otherwise the
-    // deck editor's card database display stays empty until the next launch.
-    auto *watcher = new QFutureWatcher<void>(this);
-    connect(watcher, &QFutureWatcher<void>::finished, this, [this, watcher] {
-        watcher->deleteLater();
-        if (firstRunWizardActive) {
-            // The onboarding wizard owns the first-run messaging on a clean install.
-            return;
-        }
-        QMessageBox::information(
-            this, tr("Welcome"),
-            tr("Hi! It seems like you're running this version of Cockatrice for the first time.\nAll the sets in the "
-               "card "
-               "database have been enabled.\nRead more about changing the set order or disabling specific sets and "
-               "consequent effects in the \"Manage Sets\" dialog."));
-        // The reload above replaces the set instances, so Manage Sets must open
-        // only after the finished snapshot has been swapped in.
-        actManageSets();
-    });
-    watcher->setFuture(QtConcurrent::run([cardDatabase] { cardDatabase->reloadCardDatabasesAndNotify(); }));
+    QMessageBox::information(
+        this, tr("Welcome"),
+        tr("Hi! It seems like you're running this version of Cockatrice for the first time.\nAll the sets in the card "
+           "database have been enabled.\nRead more about changing the set order or disabling specific sets and "
+           "consequent effects in the \"Manage Sets\" dialog."));
+    actManageSets();
 }
 
 /* CARD UPDATER */
@@ -1183,28 +1097,16 @@ void MainWindow::actCheckCardUpdatesBackground()
 void MainWindow::createCardUpdateProcess(bool background)
 {
     if (cardUpdateProcess) {
-        qCDebug(CardDatabaseUpdateLog) << "A card database update is already running; asking it to come to the front";
-        if (requestCardUpdateRaise()) {
-            return;
-        }
-        if (background) {
-            // A hidden run has nothing to raise: keep the user informed without blocking.
-            announceCardUpdateRunning();
-            return;
-        }
-        QMessageBox::information(this, tr("Information"),
-                                 tr("The card database updater is already open.\n"
-                                    "Look for the Oracle window - it may be behind this one."));
+        QMessageBox::information(this, tr("Information"), tr("A card database update is already running."));
         return;
     }
 
     cardUpdateProcess = new QProcess(this);
 
     connect(cardUpdateProcess, &QProcess::errorOccurred, this, &MainWindow::cardUpdateError);
+
     connect(cardUpdateProcess, qOverload<int, QProcess::ExitStatus>(&QProcess::finished), this,
             &MainWindow::cardUpdateFinished);
-    connect(cardUpdateProcess, &QProcess::readyReadStandardOutput, this, &MainWindow::cardUpdateProgressOutput);
-    connect(cardUpdateProcess, &QProcess::readyReadStandardError, this, &MainWindow::cardUpdateStandardError);
 
     // full "run the update" command; leave empty if not present
     QString updaterCmd;
@@ -1249,8 +1151,6 @@ void MainWindow::createCardUpdateProcess(bool background)
     }
 
     if (updaterCmd.isEmpty()) {
-        qCWarning(CardDatabaseUpdateLog) << "Unable to locate the card database updater; looked for"
-                                         << dir.absoluteFilePath(binaryName);
         QMessageBox::warning(this, tr("Error"),
                              tr("Unable to run the card database updater: ") + dir.absoluteFilePath(binaryName));
         exitCardDatabaseUpdate();
@@ -1258,24 +1158,13 @@ void MainWindow::createCardUpdateProcess(bool background)
         return;
     }
 
-    cardUpdateOutputBuffer.clear();
-    cardUpdateErrorOutput.clear();
-    cardUpdateErrorPartial.clear();
-    cardUpdateLoggedStage = CardUpdateStage::Unknown;
-    cardUpdateProgressLogTimer.start();
-
-    qCInfo(CardDatabaseUpdateLog) << "Starting the card database updater" << updaterCmd << "background:" << background;
-    cardUpdateStatusBar->updateStarted();
-
     if (!background) {
         cardUpdateProcess->start(updaterCmd, QStringList());
     } else {
+        cardUpdateOutputBuffer.clear();
+        connect(cardUpdateProcess, &QProcess::readyReadStandardOutput, this, &MainWindow::cardUpdateProgressOutput);
         cardUpdateProcess->start(updaterCmd, QStringList("-b"));
         statusBar()->showMessage(tr("Card database update running."));
-        if (trayIcon && SettingsCache::instance().updates().getCardDatabaseUpdateTrayNotification()) {
-            trayIcon->showMessage(tr("Card database update started"),
-                                  tr("Cockatrice is updating the card database in the background."));
-        }
     }
 }
 
@@ -1290,43 +1179,24 @@ void MainWindow::cardUpdateProgressOutput()
         if (newline < 0) {
             break;
         }
-        const QByteArray line = cardUpdateOutputBuffer.left(newline);
+        const QByteArray line = cardUpdateOutputBuffer.left(newline).trimmed();
         cardUpdateOutputBuffer.remove(0, newline + 1);
-        // Protocol emitted by `oracle`: "PROGRESS <stage> <done> <total>"
-        const std::optional<CardUpdateProgress> progress = CardUpdateProgress::fromProtocolLine(line);
-        if (!progress.has_value()) {
+        // Protocol emitted by `oracle -b`: "PROGRESS <stage> <done> <total>"
+        if (!line.startsWith("PROGRESS ")) {
             continue;
         }
-        // Log stage changes and, while a stage runs, one line per second at most, so the
-        // debug log shows liveness without flooding it.
-        if (progress->stage != cardUpdateLoggedStage || cardUpdateProgressLogTimer.elapsed() >= 1000) {
-            qCDebug(CardDatabaseUpdateLog)
-                << "Card database update" << progress->stageToken() << progress->done << "/" << progress->total;
-            cardUpdateLoggedStage = progress->stage;
-            cardUpdateProgressLogTimer.restart();
+        const QList<QByteArray> parts = line.split(' ');
+        if (parts.size() != 4) {
+            continue;
         }
-        emit cardDatabaseUpdateProgress(progress.value());
-    }
-}
-
-void MainWindow::cardUpdateStandardError()
-{
-    if (!cardUpdateProcess) {
-        return;
-    }
-    const QByteArray chunk = cardUpdateProcess->readAllStandardError();
-    if (chunk.isEmpty()) {
-        return;
-    }
-    cardUpdateErrorOutput.append(chunk);
-    cardUpdateErrorPartial.append(chunk);
-    int newline;
-    while ((newline = cardUpdateErrorPartial.indexOf('\n')) >= 0) {
-        const QByteArray line = cardUpdateErrorPartial.left(newline).trimmed();
-        cardUpdateErrorPartial.remove(0, newline + 1);
-        if (!line.isEmpty()) {
-            qCWarning(CardDatabaseUpdateLog) << "Card database updater:" << line;
+        bool doneOk = false;
+        bool totalOk = false;
+        const qint64 done = parts.at(2).toLongLong(&doneOk);
+        const qint64 total = parts.at(3).toLongLong(&totalOk);
+        if (!doneOk || !totalOk || done < 0 || total < 0) {
+            continue;
         }
+        emit cardDatabaseUpdateProgress(QString::fromLatin1(parts.at(1)), done, total);
     }
 }
 
@@ -1339,19 +1209,7 @@ void MainWindow::exitCardDatabaseUpdate()
     cardUpdateProcess = nullptr;
     statusBar()->clearMessage();
 
-    // This can be the first successful load of the session (e.g. the onboarding
-    // download), so it must own the set check for that load.
-    reloadCardDatabaseAndCheckSets();
-}
-
-void MainWindow::reloadCardDatabaseAndCheckSets()
-{
-    auto *watcher = new QFutureWatcher<void>(this);
-    connect(watcher, &QFutureWatcher<void>::finished, this, [watcher] {
-        watcher->deleteLater();
-        CardDatabaseManager::getInstance()->checkUnknownSets();
-    });
-    watcher->setFuture(QtConcurrent::run([] { CardDatabaseManager::getInstance()->loadCardDatabases(); }));
+    const auto reloadOk1 = QtConcurrent::run([] { CardDatabaseManager::getInstance()->loadCardDatabases(); });
 }
 
 void MainWindow::cardUpdateError(QProcess::ProcessError err)
@@ -1363,6 +1221,7 @@ void MainWindow::cardUpdateError(QProcess::ProcessError err)
             break;
         case QProcess::Crashed:
             error = tr("The process crashed some time after starting successfully.");
+            error += "\n\nError output:\n" + cardUpdateProcess->readAllStandardError();
             break;
         case QProcess::Timedout:
             error = tr("Timed out. The process took too long to respond. The last waitFor...() function timed out.");
@@ -1381,12 +1240,6 @@ void MainWindow::cardUpdateError(QProcess::ProcessError err)
             break;
     }
 
-    if (!cardUpdateErrorOutput.isEmpty()) {
-        error += "\n\n" + tr("Error output:") + "\n" + QString::fromUtf8(cardUpdateErrorOutput);
-        cardUpdateErrorOutput.clear();
-    }
-
-    qCWarning(CardDatabaseUpdateLog) << "The card database updater exited with an error:" << error;
     exitCardDatabaseUpdate();
     QMessageBox::warning(this, tr("Error"), tr("The card database updater exited with an error:\n%1").arg(error));
     emit cardDatabaseUpdateFinished(false);
@@ -1394,56 +1247,16 @@ void MainWindow::cardUpdateError(QProcess::ProcessError err)
 
 void MainWindow::cardUpdateFinished(int exitCode, QProcess::ExitStatus exitStatus)
 {
-    if (!cardUpdateProcess) {
-        return;
-    }
     cardUpdateProgressOutput(); // drain any progress lines not yet parsed
 
     const bool success = (exitStatus == QProcess::NormalExit) && (exitCode == 0);
     if (exitStatus == QProcess::NormalExit) {
         SettingsCache::instance().updates().setLastCardUpdateCheck(QDateTime::currentDateTime().date());
     }
-    qCInfo(CardDatabaseUpdateLog) << "The card database updater finished with exit code" << exitCode << "exit status"
-                                  << static_cast<int>(exitStatus) << "success:" << success;
     exitCardDatabaseUpdate();
-    notifyCardUpdateFinishedFromTray(success);
     emit cardDatabaseUpdateFinished(success);
 }
 
-bool MainWindow::requestCardUpdateRaise()
-{
-    const QString serverName = scopedLocalServerName(QStringLiteral("CockatriceOracleRaise"));
-    QLocalSocket socket;
-    socket.connectToServer(serverName);
-    if (!socket.waitForConnected(250)) {
-        return false;
-    }
-    socket.write("RAISE\n");
-    const bool acked = socket.waitForBytesWritten(250);
-    socket.disconnectFromServer();
-    return acked;
-}
-
-void MainWindow::announceCardUpdateRunning()
-{
-    if (SettingsCache::instance().userInterface().getShowStatusBar()) {
-        statusBar()->showMessage(tr("Card database update running."));
-    } else if (trayIcon && SettingsCache::instance().updates().getCardDatabaseUpdateTrayNotification()) {
-        trayIcon->showMessage(tr("Card database update running"),
-                              tr("Cockatrice is updating the card database in the background."));
-    }
-}
-
-void MainWindow::notifyCardUpdateFinishedFromTray(bool success)
-{
-    if (SettingsCache::instance().userInterface().getShowStatusBar() || !trayIcon ||
-        !SettingsCache::instance().updates().getCardDatabaseUpdateTrayNotification()) {
-        return;
-    }
-    trayIcon->showMessage(tr("Card database update finished"),
-                          success ? tr("The card database is up to date.") : tr("The card database update failed."));
-}
-
 void MainWindow::actCheckServerUpdates()
 {
     auto hps = new HandlePublicServers(this);
@@ -1553,8 +1366,7 @@ void MainWindow::actAddCustomSet()
         QMessageBox::information(
             this, tr("Load sets/cards"),
             tr("The new sets/cards have been added successfully.\nCockatrice will now reload the card database."));
-        // Imported files can introduce sets the config has never seen.
-        reloadCardDatabaseAndCheckSets();
+        const auto reloadOk1 = QtConcurrent::run([] { CardDatabaseManager::getInstance()->loadCardDatabases(); });
     } else {
         QMessageBox::warning(this, tr("Load sets/cards"), tr("Sets/cards failed to import."));
     }
diff --git a/cockatrice/src/interface/window_main.h b/cockatrice/src/interface/window_main.h
index ee8873000..1c4dde300 100644
--- a/cockatrice/src/interface/window_main.h
+++ b/cockatrice/src/interface/window_main.h
@@ -26,42 +26,35 @@
 #define WINDOW_H
 
 #include "../client/lag_monitor.h"
-#include "../client/network/update/client/release_channel.h"
-#include "card_database_update/card_update_progress.h"
 #include "connection_controller/remote_connection_controller.h"
+#include "widgets/dialogs/dlg_local_game_options.h"
 
-#include <QByteArray>
-#include <QDir>
-#include <QElapsedTimer>
 #include <QList>
-#include <QLoggingCategory>
 #include <QMainWindow>
-#include <QMenu>
-#include <QProcess>
-#include <QString>
-#include <QStringList>
-#include <QUrl>
-#include <QtGlobal>
+#include <QMessageBox>
+#include <QSystemTrayIcon>
+#include <QtNetwork>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
-#include <qtmetamacros.h>
-
-class QAction;
-class QWidget;
-struct LocalGameOptions;
+#include <libcockatrice/protocol/pb/response.pb.h>
 
 inline Q_LOGGING_CATEGORY(WindowMainLog, "window_main");
 inline Q_LOGGING_CATEGORY(WindowMainStartupLog, "window_main.startup");
 inline Q_LOGGING_CATEGORY(WindowMainStartupVersionLog, "window_main.startup.version");
 inline Q_LOGGING_CATEGORY(WindowMainStartupShortcutsLog, "window_main.startup.shortcuts");
 inline Q_LOGGING_CATEGORY(WindowMainStartupAutoconnectLog, "window_main.startup.autoconnect");
-inline Q_LOGGING_CATEGORY(CardDatabaseUpdateLog, "card_database.update");
 
+class Release;
+class DlgConnect;
 class DlgViewLog;
 class GameReplay;
+class HandlePublicServers;
+class LocalClient;
 class LocalServer;
+class QLabel;
 class LatencyStatusWidget;
-class CardDatabaseUpdateStatusBar;
+class QThread;
 class RemoteClient;
+class ServerInfo_User;
 class TabSupervisor;
 class WndSets;
 class DlgTipOfTheDay;
@@ -72,13 +65,13 @@ class MainWindow : public QMainWindow
 {
     Q_OBJECT
 signals:
-    /** @brief Emitted after the card-database update subprocess exits. */
+    /** @brief Emitted after the background card-database update subprocess exits. */
     void cardDatabaseUpdateFinished(bool success);
 
-    /** @brief Emitted while the card-database update subprocess runs.
-     *         @p progress.done/@p progress.total are byte counts for the first two stages
-     *         and set indices for "import". */
-    void cardDatabaseUpdateProgress(const CardUpdateProgress &progress);
+    /** @brief Emitted while the background card-database update subprocess runs.
+     *         @p stage is one of "download", "scan" or "import"; @p done/@p total
+     *         are byte counts for the first two stages and set indices for "import". */
+    void cardDatabaseUpdateProgress(const QString &stage, qint64 done, qint64 total);
 
 public slots:
     void actCheckCardUpdates();
@@ -110,7 +103,6 @@ private slots:
     void cardUpdateError(QProcess::ProcessError err);
     void cardUpdateFinished(int exitCode, QProcess::ExitStatus exitStatus);
     void cardUpdateProgressOutput();
-    void cardUpdateStandardError();
     void refreshShortcuts();
     void cardDatabaseLoadingFailed();
     void cardDatabaseNewSetsFound(int numUnknownSets, QStringList unknownSetsNames);
@@ -149,32 +141,12 @@ private:
 
     void runFirstRunWizard(bool firstRun = false);
 
-    /** @brief Warns once when a non-portable install keeps its data paths inside the program directory. */
-    void warnAboutDataPathsInProgramDir();
-
     inline QString getCardUpdaterBinaryName()
     {
         return "oracle";
     }
     void createCardUpdateProcess(bool background = false);
     void exitCardDatabaseUpdate();
-    /**
-     * @brief Reloads the card database on a worker thread and runs checkUnknownSets() once the finished
-     *        snapshot has been swapped in.
-     *
-     * The loader never runs checkUnknownSets() itself (see main.cpp); post-update loads that can introduce
-     * new sets must own the check, and it has to run after the queued snapshot swap, not on the worker.
-     */
-    void reloadCardDatabaseAndCheckSets();
-    /**
-     * @brief Tries to bring the open card database updater window to the front.
-     * @return true when the updater acknowledged the request
-     */
-    bool requestCardUpdateRaise();
-    /** @brief Tells the user an update is running without blocking, honoring a hidden status bar. */
-    void announceCardUpdateRunning();
-    /** @brief Posts a tray notification when the status bar cannot show progress. */
-    void notifyCardUpdateFinishedFromTray(bool success);
 
     void startLocalGame(const LocalGameOptions &options);
 
@@ -201,11 +173,6 @@ private:
     bool firstRunWizardActive = false;
     QProcess *cardUpdateProcess;
     QByteArray cardUpdateOutputBuffer;
-    QByteArray cardUpdateErrorOutput;  ///< diagnostic output collected from the updater's stderr
-    QByteArray cardUpdateErrorPartial; ///< incomplete trailing stderr line, kept for line-based logging
-    CardUpdateStage cardUpdateLoggedStage = CardUpdateStage::Unknown; ///< stage of the last logged progress update
-    QElapsedTimer cardUpdateProgressLogTimer;                   ///< throttles progress logging to the running stage
-    CardDatabaseUpdateStatusBar *cardUpdateStatusBar = nullptr; ///< status bar widget tracking the card database update
     DlgViewLog *logviewDialog;
     GameReplay *replay;
     DlgTipOfTheDay *tip;
diff --git a/cockatrice/src/main.cpp b/cockatrice/src/main.cpp
index 3f63efc3b..af519f436 100644
--- a/cockatrice/src/main.cpp
+++ b/cockatrice/src/main.cpp
@@ -25,55 +25,36 @@
 #include "client/sound_engine.h"
 #include "client/url_scheme_event_filter.h"
 #include "database/interface/settings_card_preference_provider.h"
-#include "interface/intents/intent.h"
 #include "interface/intents/intent_open_local_deck.h"
 #include "interface/logger.h"
 #include "interface/pixel_map_generator.h"
 #include "interface/theme_manager.h"
+#include "interface/widgets/dialogs/dlg_settings.h"
+#include "interface/widgets/tabs/tab_supervisor.h"
 #include "interface/window_main.h"
-#include "libcockatrice/card/database/card_database.h"
-#include "libcockatrice/rng/rng_abstract.h"
 #include "single_instance_manager.h"
 #include "version_string.h"
 
 #include <QApplication>
-#include <QByteArray>
-#include <QByteArrayView>
-#include <QCommandLineOption>
-#include <QCommandLineParser>
-#include <QCoreApplication>
 #include <QCryptographicHash>
+#include <QDateTime>
 #include <QDebug>
-#include <QFileInfo>
-#include <QGuiApplication>
-#include <QIcon>
-#include <QList>
 #include <QLocale>
 #include <QMessageBox>
-#include <QMessageLogger>
-#include <QNetworkInterface>
-#include <QObject>
-#include <QRegularExpression>
-#include <QRegularExpressionMatch>
-#include <QSharedPointer>
-#include <QString>
-#include <QStringList>
-#include <QStringLiteral>
+#include <QSystemTrayIcon>
 #include <QTranslator>
 #include <QUrl>
-#include <QtGlobal>
 #include <algorithm>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/rng/rng_sfmt.h>
+#include <libcockatrice/settings/appearance_settings.h>
 #include <libcockatrice/settings/card_database_settings.h>
+#include <libcockatrice/settings/cards_display_settings.h>
 #include <libcockatrice/settings/interface_settings.h>
 #include <libcockatrice/settings/network_settings.h>
 #include <libcockatrice/settings/personal_settings.h>
 #include <libcockatrice/utility/cryptoutil.h>
 #include <libcockatrice/utility/translation_loader.h>
-#include <qlogging.h>
-#include <qnamespace.h>
-#include <qsystemdetection.h>
 
 QTranslator *translator, *qtTranslator;
 RNG_Abstract *rng;
@@ -110,7 +91,6 @@ static void CockatriceLogger(QtMsgType type, const QMessageLogContext &ctx, cons
 #include <ShlObj.h>
 #include <ctime>
 #include <filesystem>
-
 #pragma comment(lib, "DbgHelp.lib") // Link the DbgHelp library
 // clang-format on
 
@@ -343,12 +323,11 @@ int main(int argc, char *argv[])
     // contention that happens when the load runs alongside window construction.
     // The CardDatabaseModel populates from the already-loaded data in its
     // constructor, so the window appears fully populated with no startup lag.
-    // Note: checkUnknownSets() is deliberately not run for this front-loaded
-    // parse. It would run before MainWindow exists, so
-    // cardDatabaseNewSetsFound / cardDatabaseAllNewSetsEnabled would have no
-    // receivers, and enabling the sets up-front would suppress the first-run
-    // experience MainWindow::startupConfigCheck() and the onboarding wizard
-    // provide. Callers that load after startup own the check.
+    // Note: checkUnknownSets() is deferred from the initial load to
+    // MainWindow::startupConfigCheck() so that
+    // cardDatabaseNewSetsFound / cardDatabaseAllNewSetsEnabled have live
+    // receivers when emitted.  Subsequent reloads (e.g. path changes) call
+    // checkUnknownSets() directly from the loader after the first load.
     CardDatabaseManager::getInstance()->loadCardDatabases();
 
     MainWindow ui;
diff --git a/cockatrice/src/main.h b/cockatrice/src/main.h
index 3d772915b..eee262d2c 100644
--- a/cockatrice/src/main.h
+++ b/cockatrice/src/main.h
@@ -15,6 +15,7 @@ class CardDatabase;
 class QString;
 class QSystemTrayIcon;
 class QTranslator;
+class SoundEngine;
 
 extern CardDatabase *db;
 
diff --git a/cockatrice/src/single_instance_manager.cpp b/cockatrice/src/single_instance_manager.cpp
index 08294d72c..8d363ff34 100644
--- a/cockatrice/src/single_instance_manager.cpp
+++ b/cockatrice/src/single_instance_manager.cpp
@@ -1,15 +1,7 @@
 #include "single_instance_manager.h"
 
-#include <QByteArray>
-#include <QDataStream>
-#include <QIODevice>
-#include <QList>
-#include <QLocalServer>
-#include <QLocalSocket>
+#include <QDir>
 #include <QPointer>
-#include <QSharedPointer>
-#include <QtGlobal>
-#include <libcockatrice/utility/local_server_name.h>
 
 namespace
 {
@@ -25,9 +17,17 @@ SingleInstanceManager::SingleInstanceManager(QObject *parent) : QObject(parent)
 
 bool SingleInstanceManager::tryRun(const QStringList &filesToSend)
 {
-    // Scope the socket name to the current user so one user's instance cannot
+    // Scope the socket name to the current user. On Linux the default abstract
+    // namespace is system-wide, so a plain name would let one user's instance
     // hijack another user's session.
-    serverName = scopedLocalServerName(QStringLiteral("CockatriceSingleInstance"));
+    QString userName = qEnvironmentVariable("USER");
+    if (userName.isEmpty()) {
+        userName = qEnvironmentVariable("USERNAME");
+    }
+    if (userName.isEmpty()) {
+        userName = QDir::home().dirName();
+    }
+    serverName = QStringLiteral("CockatriceSingleInstance-%1").arg(userName);
 
     // Hand off to an already-running primary instance if one exists. Never steal
     // the socket of a busy primary: it is alive and will act on the payload.
diff --git a/cockatrice/src/single_instance_manager.h b/cockatrice/src/single_instance_manager.h
index 727994208..d3884a60f 100644
--- a/cockatrice/src/single_instance_manager.h
+++ b/cockatrice/src/single_instance_manager.h
@@ -1,12 +1,10 @@
 #ifndef COCKATRICE_SINGLE_INSTANCE_MANAGER_H
 #define COCKATRICE_SINGLE_INSTANCE_MANAGER_H
 
-#include <QObject>
-#include <QString>
-#include <QStringList>
-#include <qtmetamacros.h>
-
-class QLocalServer;
+#include <QDataStream>
+#include <QDebug>
+#include <QLocalServer>
+#include <QLocalSocket>
 
 class SingleInstanceManager : public QObject
 {
diff --git a/doc/carddatabase_v4/cards.xsd b/doc/carddatabase_v4/cards.xsd
index df52d6327..82aed32ab 100644
--- a/doc/carddatabase_v4/cards.xsd
+++ b/doc/carddatabase_v4/cards.xsd
@@ -29,6 +29,8 @@
                 <xs:attribute type="xs:anyURI" name="picURL" use="optional" />
                 <xs:attribute type="xs:string" name="num" use="optional" />
                 <xs:attribute type="xs:string" name="rarity" use="optional" />
+                <xs:attribute type="xs:boolean" name="isOnlineOnly" use="optional" />
+                <xs:attribute type="xs:boolean" name="isRebalanced" use="optional" />
                 <xs:attribute type="xs:string" name="flavorName" use="optional"/>
             </xs:extension>
         </xs:simpleContent>
diff --git a/doc/doxygen/README.md b/doc/doxygen/README.md
index 230422303..988147159 100644
--- a/doc/doxygen/README.md
+++ b/doc/doxygen/README.md
@@ -1,17 +1,3 @@
-## Building Doxygen Documentation
-
-We use [Doxygen](https://www.doxygen.nl) for our code documentation.  
-After installing the tool, you can build a HTML webpage into the `/docs` folder according to our [configuration](https://github.com/Cockatrice/Cockatrice/blob/master/Doxyfile):
-```bash
-doxygen Doxyfile
-```
-Open the `index.html` file in the `/docs/html/` folder to browse the result locally.  
-There is also an online version we host at the Cockatrice webpage: [cockatrice.github.io/docs](https://cockatrice.github.io/docs)
-
-Doxygen's own documenation can be found at [www.doxygen.nl/manual](https://www.doxygen.nl/manual).
-
-<br>
-
 ## Doxygen Documentation Theme
 
 Required changes to the `Doxyfile` config from the [theme docs](https://jothepro.github.io/doxygen-awesome-css/index.html#autotoc_md16) to make [doxygen-awesome-css](https://github.com/jothepro/doxygen-awesome-css) work:
diff --git a/doc/doxygen/pages/developer_documentation/card_database_schema_and_parsing.md b/doc/doxygen/extra-pages/developer_documentation/card_database_schema_and_parsing.md
similarity index 100%
rename from doc/doxygen/pages/developer_documentation/card_database_schema_and_parsing.md
rename to doc/doxygen/extra-pages/developer_documentation/card_database_schema_and_parsing.md
diff --git a/doc/doxygen/pages/developer_documentation/displaying_cards.md b/doc/doxygen/extra-pages/developer_documentation/displaying_cards.md
similarity index 100%
rename from doc/doxygen/pages/developer_documentation/displaying_cards.md
rename to doc/doxygen/extra-pages/developer_documentation/displaying_cards.md
diff --git a/doc/doxygen/pages/developer_documentation/index.md b/doc/doxygen/extra-pages/developer_documentation/index.md
similarity index 100%
rename from doc/doxygen/pages/developer_documentation/index.md
rename to doc/doxygen/extra-pages/developer_documentation/index.md
diff --git a/doc/doxygen/pages/developer_documentation/loading_card_pictures.md b/doc/doxygen/extra-pages/developer_documentation/loading_card_pictures.md
similarity index 100%
rename from doc/doxygen/pages/developer_documentation/loading_card_pictures.md
rename to doc/doxygen/extra-pages/developer_documentation/loading_card_pictures.md
diff --git a/doc/doxygen/pages/developer_documentation/logging.md b/doc/doxygen/extra-pages/developer_documentation/logging.md
similarity index 100%
rename from doc/doxygen/pages/developer_documentation/logging.md
rename to doc/doxygen/extra-pages/developer_documentation/logging.md
diff --git a/doc/doxygen/pages/developer_documentation/network/client/game_event_handler.md b/doc/doxygen/extra-pages/developer_documentation/network/client/game_event_handler.md
similarity index 93%
rename from doc/doxygen/pages/developer_documentation/network/client/game_event_handler.md
rename to doc/doxygen/extra-pages/developer_documentation/network/client/game_event_handler.md
index 051823c6c..fbb298d3a 100644
--- a/doc/doxygen/pages/developer_documentation/network/client/game_event_handler.md
+++ b/doc/doxygen/extra-pages/developer_documentation/network/client/game_event_handler.md
@@ -90,13 +90,13 @@ This keeps the handler independent of concrete UI implementations.
 
 `GameEventHandler` and `PlayerEventHandler` work together but have distinct roles:
 
-| GameEventHandler  | PlayerEventHandler     |
-| ----------------- | ---------------------- |
-| Global game state | Per-player state       |
-| Turn / phase flow | Zones and cards        |
-| Player join/leave | Player actions         |
-| Spectator events  | Player-specific events |
-| Chat dispatch     | Card and zone updates  |
+| GameEventHandler | PlayerEventHandler |
+|------------------|--------------------|
+| Global game state | Per-player state |
+| Turn / phase flow | Zones and cards |
+| Player join/leave | Player actions |
+| Spectator events | Player-specific events |
+| Chat dispatch | Card and zone updates |
 
 When a server event is associated with a specific player, `GameEventHandler`
 routes it to the corresponding `PlayerEventHandler`. Events without a player
diff --git a/doc/doxygen/pages/developer_documentation/network/client/index.md b/doc/doxygen/extra-pages/developer_documentation/network/client/index.md
similarity index 100%
rename from doc/doxygen/pages/developer_documentation/network/client/index.md
rename to doc/doxygen/extra-pages/developer_documentation/network/client/index.md
diff --git a/doc/doxygen/pages/developer_documentation/network/client/player_event_handler.md b/doc/doxygen/extra-pages/developer_documentation/network/client/player_event_handler.md
similarity index 100%
rename from doc/doxygen/pages/developer_documentation/network/client/player_event_handler.md
rename to doc/doxygen/extra-pages/developer_documentation/network/client/player_event_handler.md
diff --git a/doc/doxygen/extra-pages/developer_documentation/network/game_event_handler.md b/doc/doxygen/extra-pages/developer_documentation/network/game_event_handler.md
new file mode 100644
index 000000000..fbb298d3a
--- /dev/null
+++ b/doc/doxygen/extra-pages/developer_documentation/network/game_event_handler.md
@@ -0,0 +1,170 @@
+@page game_event_handler GameEventHandler
+
+## Overview
+
+`GameEventHandler` is the central coordinator for **game-wide commands and events**.
+It acts as the bridge between the networking layer (protobuf messages received from
+the server) and the local game model and UI.
+
+Unlike `PlayerEventHandler`, which is responsible for player-scoped state and zones,
+`GameEventHandler` handles:
+
+- Global game flow (turns, phases, host changes)
+- Player and spectator lifecycle events
+- Chat and logging events
+- Dispatching incoming events to the appropriate subsystem
+- Sending locally initiated commands to the server
+
+In short, it is the **top-level event dispatcher** for an active game.
+
+---
+
+## Responsibilities
+
+`GameEventHandler` has four primary responsibilities:
+
+### 1. Sending game-wide commands
+
+UI actions that affect the game as a whole (e.g. advancing the turn, changing phases,
+sending chat messages) are translated into protobuf commands and sent to the server
+via this class.
+
+Examples include:
+
+- Advancing or reversing the turn order
+- Conceding or unconceding
+- Changing the active phase
+- Leaving the game
+- Sending chat messages
+
+These commands are wrapped in `PendingCommand` instances so their lifecycle and
+responses can be tracked.
+
+---
+
+### 2. Processing incoming game events
+
+Incoming server messages arrive as a `GameEventContainer`.
+`GameEventHandler` is responsible for:
+
+- Emitting lifecycle signals before and after processing
+- Dispatching each event to the correct handler
+- Forwarding player-scoped events to `PlayerEventHandler` instances
+- Handling spectator-only and game-global events directly
+
+This design keeps networking concerns isolated from game logic and UI code.
+
+---
+
+### 3. Managing global game state transitions
+
+Certain events affect the entire game state and require coordinated updates across
+multiple subsystems. Examples include:
+
+- Full game state synchronization
+- Active player or phase changes
+- Game host changes
+- Game closure
+- Turn reversal
+
+`GameEventHandler` ensures these events are processed in a consistent order and
+that all interested systems are notified via Qt signals.
+
+---
+
+### 4. Emitting UI and logging signals
+
+Rather than directly manipulating UI widgets, `GameEventHandler` emits
+high-level signals that are consumed by:
+
+- Game widgets
+- Player and spectator lists
+- Message and event logs
+- Status indicators (ready state, deck selection, connection state)
+
+This keeps the handler independent of concrete UI implementations.
+
+---
+
+## Relationship to PlayerEventHandler
+
+`GameEventHandler` and `PlayerEventHandler` work together but have distinct roles:
+
+| GameEventHandler | PlayerEventHandler |
+|------------------|--------------------|
+| Global game state | Per-player state |
+| Turn / phase flow | Zones and cards |
+| Player join/leave | Player actions |
+| Spectator events | Player-specific events |
+| Chat dispatch | Card and zone updates |
+
+When a server event is associated with a specific player, `GameEventHandler`
+routes it to the corresponding `PlayerEventHandler`. Events without a player
+context are handled directly.
+
+---
+
+## Event Processing Flow
+
+A typical incoming event flow looks like this:
+
+1. `AbstractClient` receives a `GameEventContainer`
+2. `GameEventHandler::processGameEventContainer()` is called
+3. `containerProcessingStarted()` is emitted
+4. Each event is:
+    - Handled directly **or**
+    - Forwarded to a `PlayerEventHandler`
+5. Logging and UI signals are emitted as needed
+6. `containerProcessingDone()` is emitted
+
+This structured flow makes it easy to:
+
+- Suppress UI updates during replays
+- Handle reconnections cleanly
+- Detect flood protection or error states
+
+---
+
+## Command Lifecycle
+
+Outgoing commands follow a similar structured path:
+
+1. UI action triggers a `handle*()` method
+2. A protobuf command is constructed
+3. The command is wrapped in a `PendingCommand`
+4. `sendGameCommand()` sends it to the server
+5. `commandFinished()` receives the response
+6. Errors or flood conditions are handled centrally
+
+This approach avoids duplicated error handling across UI code.
+
+---
+
+## Design Goals
+
+`GameEventHandler` is designed to be:
+
+- **Centralized** – one entry point for all game-wide events
+- **UI-agnostic** – communicates via signals, not widgets
+- **Predictable** – well-defined event ordering and lifecycle
+- **Composable** – works in concert with `PlayerEventHandler`
+- **Testable** – logic is separated from rendering
+
+---
+
+## Related Classes
+
+- @ref GameEventHandler
+- @ref PlayerEventHandler
+- `GameEventContainer`
+- `PendingCommand`
+- `AbstractClient`
+- `AbstractGame`
+
+---
+
+## See Also
+
+- @ref GameLogic
+- @ref PlayerEventHandler
+- @ref GameState
diff --git a/doc/doxygen/pages/developer_documentation/network/index.md b/doc/doxygen/extra-pages/developer_documentation/network/index.md
similarity index 100%
rename from doc/doxygen/pages/developer_documentation/network/index.md
rename to doc/doxygen/extra-pages/developer_documentation/network/index.md
diff --git a/doc/doxygen/extra-pages/developer_documentation/network/player_event_handler.md b/doc/doxygen/extra-pages/developer_documentation/network/player_event_handler.md
new file mode 100644
index 000000000..6878758da
--- /dev/null
+++ b/doc/doxygen/extra-pages/developer_documentation/network/player_event_handler.md
@@ -0,0 +1,199 @@
+@page player_event_handler PlayerEventHandler
+
+## Overview
+
+`PlayerEventHandler` is responsible for applying **player-scoped game events**
+to a single `Player` instance. These events modify the player’s board state,
+zones, cards, counters, arrows, and associated UI and logging output.
+
+Each `PlayerEventHandler` instance is bound **1:1 to a Player** and is invoked
+exclusively by @ref GameEventHandler after basic routing and validation of
+incoming server events.
+
+This class represents the lowest-level authoritative application of game state
+changes on the client.
+
+---
+
+## Scope and Authority
+
+`PlayerEventHandler` operates under the following guarantees:
+
+- All incoming events are **authoritative** and already validated by the server
+- Events refer to valid players, zones, and card identifiers
+- Ordering is guaranteed by the server and preserved by `GameEventHandler`
+
+As a result, the handler does **not** perform rule validation or permission
+checks. Its responsibility is to *apply* state, not *decide* legality.
+
+---
+
+## Responsibilities
+
+### 1. Applying player-specific state changes
+
+The primary responsibility of `PlayerEventHandler` is to mutate player-owned
+state, including:
+
+- Cards (`CardItem`)
+- Zones (`CardZoneLogic`)
+- Counters (card-level and player-level)
+- Attachments and arrows
+- Zone configuration flags (reveal / peek behavior)
+
+Many handlers update both **logical state** and **visual/UI state** in tandem.
+
+---
+
+### 2. Coordinating complex card movement
+
+Some events—most notably card movement—require coordinated updates across
+multiple systems. For example, `eventMoveCard()`:
+
+- Removes the card from the source zone
+- Updates ownership, visibility, and identity
+- Handles attachments and arrow cleanup
+- Emits undo-draw or move logs
+- Inserts the card into the destination zone
+- Updates menus, hover state, and graphics
+
+This makes `PlayerEventHandler` intentionally stateful and tightly coupled to
+the board implementation.
+
+---
+
+### 3. Emitting logging signals
+
+Rather than writing directly to logs or widgets, `PlayerEventHandler` emits
+structured Qt signals describing *what happened*, including:
+
+- Chat messages
+- Card movement
+- Shuffles and randomization
+- Reveals and peeks
+- Counter and attribute changes
+
+These signals are consumed by logging systems and UI components, keeping
+presentation concerns out of the handler.
+
+Logging signals may be emitted **before or after mutation**, depending on
+whether later changes would invalidate log data (e.g. card identity).
+
+---
+
+### 4. Handling cross-player interactions
+
+Although bound to a single player, some events necessarily affect other
+players’ state, including:
+
+- Moving cards between players
+- Attaching cards to another player’s permanents
+- Creating arrows targeting other players or cards
+
+In these cases, `PlayerEventHandler` performs the minimal required mutation
+while respecting ownership boundaries enforced elsewhere.
+
+---
+
+## Event Dispatch Model
+
+`PlayerEventHandler` exposes a single public entry point:
+
+- `processGameEvent()`
+
+This method:
+
+1. Receives a generic `GameEvent`
+2. Switches on `GameEventType`
+3. Extracts the appropriate protobuf extension
+4. Forwards the event to a typed handler
+
+This keeps the event routing centralized and makes it easy to audit coverage
+when new game events are introduced.
+
+Unhandled events are logged as warnings.
+
+---
+
+## Event Categories
+
+For clarity, event handlers are grouped conceptually into:
+
+- **Chat and randomization**
+    - Chat messages
+    - Shuffles
+    - Dice rolls
+
+- **Arrows and targeting**
+    - Create / delete arrows
+
+- **Card and token creation**
+    - Token generation
+    - Counter creation
+
+- **Card attributes and counters**
+    - Tapped state
+    - Power/toughness
+    - Annotations
+    - Card- and player-level counters
+
+- **Zone-level operations**
+    - Card movement
+    - Zone dumps
+    - Card destruction
+    - Attachments
+
+- **Draw and reveal**
+    - Drawing cards
+    - Reveals, peeks, and reveal windows
+
+- **Zone configuration**
+    - Always-reveal and always-look-at-top-card flags
+
+This grouping mirrors the structure of the header file and reflects the
+conceptual responsibilities of the class.
+
+---
+
+## Relationship to GameEventHandler
+
+`PlayerEventHandler` is never instantiated or invoked directly by UI code.
+Instead:
+
+1. `GameEventHandler` receives a `GameEventContainer`
+2. Player-scoped events are routed to the appropriate `PlayerEventHandler`
+3. Global or spectator events are handled elsewhere
+
+This separation keeps game-wide logic decoupled from player board state and
+makes reconnection and replay handling simpler.
+
+---
+
+## Design Intent
+
+`PlayerEventHandler` is designed to be:
+
+- **Authoritative** – applies server state exactly as received
+- **Stateful** – maintains consistency across cards, zones, and UI
+- **Explicit** – one handler per event type
+- **UI-aware** – updates views and menus as part of state mutation
+- **Auditable** – easy to trace what code handles which event
+
+---
+
+## Related Classes
+
+- @ref PlayerEventHandler
+- @ref GameEventHandler
+- `Player`
+- `CardItem`
+- `CardZoneLogic`
+- `GameEvent`
+- `GameEventContext`
+
+---
+
+## See Also
+
+- @ref GameLogicPlayers
+- @ref GameLogic
diff --git a/doc/doxygen/pages/developer_documentation/network/protocol/index.md b/doc/doxygen/extra-pages/developer_documentation/network/protocol/index.md
similarity index 100%
rename from doc/doxygen/pages/developer_documentation/network/protocol/index.md
rename to doc/doxygen/extra-pages/developer_documentation/network/protocol/index.md
diff --git a/doc/doxygen/pages/developer_documentation/network/protocol/protocol_command_container.md b/doc/doxygen/extra-pages/developer_documentation/network/protocol/protocol_command_container.md
similarity index 100%
rename from doc/doxygen/pages/developer_documentation/network/protocol/protocol_command_container.md
rename to doc/doxygen/extra-pages/developer_documentation/network/protocol/protocol_command_container.md
diff --git a/doc/doxygen/pages/developer_documentation/network/protocol/protocol_game_command.md b/doc/doxygen/extra-pages/developer_documentation/network/protocol/protocol_game_command.md
similarity index 100%
rename from doc/doxygen/pages/developer_documentation/network/protocol/protocol_game_command.md
rename to doc/doxygen/extra-pages/developer_documentation/network/protocol/protocol_game_command.md
diff --git a/doc/doxygen/pages/developer_documentation/network/protocol/protocol_overview.md b/doc/doxygen/extra-pages/developer_documentation/network/protocol/protocol_overview.md
similarity index 100%
rename from doc/doxygen/pages/developer_documentation/network/protocol/protocol_overview.md
rename to doc/doxygen/extra-pages/developer_documentation/network/protocol/protocol_overview.md
diff --git a/doc/doxygen/pages/developer_documentation/network/protocol/protocol_response.md b/doc/doxygen/extra-pages/developer_documentation/network/protocol/protocol_response.md
similarity index 100%
rename from doc/doxygen/pages/developer_documentation/network/protocol/protocol_response.md
rename to doc/doxygen/extra-pages/developer_documentation/network/protocol/protocol_response.md
diff --git a/doc/doxygen/pages/developer_documentation/network/protocol/protocol_server_message.md b/doc/doxygen/extra-pages/developer_documentation/network/protocol/protocol_server_message.md
similarity index 100%
rename from doc/doxygen/pages/developer_documentation/network/protocol/protocol_server_message.md
rename to doc/doxygen/extra-pages/developer_documentation/network/protocol/protocol_server_message.md
diff --git a/doc/doxygen/pages/developer_documentation/primer_cards.md b/doc/doxygen/extra-pages/developer_documentation/primer_cards.md
similarity index 100%
rename from doc/doxygen/pages/developer_documentation/primer_cards.md
rename to doc/doxygen/extra-pages/developer_documentation/primer_cards.md
diff --git a/doc/doxygen/pages/developer_documentation/querying_the_card_database.md b/doc/doxygen/extra-pages/developer_documentation/querying_the_card_database.md
similarity index 100%
rename from doc/doxygen/pages/developer_documentation/querying_the_card_database.md
rename to doc/doxygen/extra-pages/developer_documentation/querying_the_card_database.md
diff --git a/doc/doxygen/pages/index.md b/doc/doxygen/extra-pages/index.md
similarity index 77%
rename from doc/doxygen/pages/index.md
rename to doc/doxygen/extra-pages/index.md
index 9dafe1882..b3363d3f4 100644
--- a/doc/doxygen/pages/index.md
+++ b/doc/doxygen/extra-pages/index.md
@@ -1,9 +1,5 @@
 @mainpage Documentation
 
-<div align="center">
-  <img src="cockatrice_logo.svg" style="width: 300px; max-width: 100%; height: auto;">
-</div>
-
 Welcome to the Cockatrice code documentation.
 
 - @subpage user_reference
diff --git a/doc/doxygen/pages/user_documentation/card_pictures/custom_card_pictures.md b/doc/doxygen/extra-pages/user_documentation/card_pictures/custom_card_pictures.md
similarity index 84%
rename from doc/doxygen/pages/user_documentation/card_pictures/custom_card_pictures.md
rename to doc/doxygen/extra-pages/user_documentation/card_pictures/custom_card_pictures.md
index bcea6db8b..3f1079661 100644
--- a/doc/doxygen/pages/user_documentation/card_pictures/custom_card_pictures.md
+++ b/doc/doxygen/extra-pages/user_documentation/card_pictures/custom_card_pictures.md
@@ -69,17 +69,17 @@ the 'Deck Editor' tab, in the 'URL Download Priority' section.
 
 The following reference points are available:
 
-| Reference point                 | Description                                                                                                                        | Example                                      |
-| ------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------- |
-| `!name!`                        | Card name                                                                                                                          | `Example Card`                               |
-| `!name_lower!`                  | Card name, lower case                                                                                                              | `example card`                               |
-| `!corrected_name!`              | Corrected card name                                                                                                                | `ExampleCard` (instead of "Example // Card") |
-| `!corrected_name_lower!`        | Corrected card name, lower case                                                                                                    | `examplecard`                                |
-| `!sflang!`                      | Scryfall language code for the current client language; defaults to English when the language has no localized images              | `en`, `zhs`                                  |
-| `!setcode!` / `!setcode_lower!` | Set code                                                                                                                           | `EXM` / `exm`                                |
-| `!setname!` / `!setname_lower!` | Full set name                                                                                                                      | `Exemplary Set` / `exemplary set`            |
-| `!set:<property>!`              | A property of this printing, e.g. `muid` (Gatherer multiverse ID), `uuid` (Scryfall UUID), `num` (collector number), `rarity`      | `373549`                                     |
-| `!prop:<property>!`             | A property of the card, e.g. `side` (front/back), `colors`, `cmc`, `coloridentity`, `type`, `pt`, and the format legality statuses | `front`                                      |
+| Reference point                 | Description                     | Example        |
+| ------------------------------- | ------------------------------- | -------------- |
+| `!name!`                        | Card name                       | `Example Card` |
+| `!name_lower!`                  | Card name, lower case           | `example card` |
+| `!corrected_name!`              | Corrected card name             | `ExampleCard` (instead of "Example // Card") |
+| `!corrected_name_lower!`        | Corrected card name, lower case | `examplecard`  |
+| `!sflang!`                      | Scryfall language code for the current client language; defaults to English when the language has no localized images | `en`, `zhs` |
+| `!setcode!` / `!setcode_lower!` | Set code                        | `EXM` / `exm`  |
+| `!setname!` / `!setname_lower!` | Full set name                   | `Exemplary Set` / `exemplary set` |
+| `!set:<property>!`              | A property of this printing, e.g. `muid` (Gatherer multiverse ID), `uuid` (Scryfall UUID), `num` (collector number), `rarity` | `373549` |
+| `!prop:<property>!`             | A property of the card, e.g. `side` (front/back), `colors`, `cmc`, `coloridentity`, `type`, `pt`, and the format legality statuses | `front` |
 
 The `!set:...!` and `!prop:...!` reference points support two modifiers:
 
diff --git a/doc/doxygen/pages/user_documentation/deck_management/creating_decks.md b/doc/doxygen/extra-pages/user_documentation/deck_management/creating_decks.md
similarity index 100%
rename from doc/doxygen/pages/user_documentation/deck_management/creating_decks.md
rename to doc/doxygen/extra-pages/user_documentation/deck_management/creating_decks.md
diff --git a/doc/doxygen/pages/user_documentation/deck_management/editing_decks.md b/doc/doxygen/extra-pages/user_documentation/deck_management/editing_decks.md
similarity index 100%
rename from doc/doxygen/pages/user_documentation/deck_management/editing_decks.md
rename to doc/doxygen/extra-pages/user_documentation/deck_management/editing_decks.md
diff --git a/doc/doxygen/pages/user_documentation/deck_management/editing_decks_classic.md b/doc/doxygen/extra-pages/user_documentation/deck_management/editing_decks_classic.md
similarity index 100%
rename from doc/doxygen/pages/user_documentation/deck_management/editing_decks_classic.md
rename to doc/doxygen/extra-pages/user_documentation/deck_management/editing_decks_classic.md
diff --git a/doc/doxygen/pages/user_documentation/deck_management/editing_decks_printings.md b/doc/doxygen/extra-pages/user_documentation/deck_management/editing_decks_printings.md
similarity index 100%
rename from doc/doxygen/pages/user_documentation/deck_management/editing_decks_printings.md
rename to doc/doxygen/extra-pages/user_documentation/deck_management/editing_decks_printings.md
diff --git a/doc/doxygen/pages/user_documentation/deck_management/editing_decks_visual.md b/doc/doxygen/extra-pages/user_documentation/deck_management/editing_decks_visual.md
similarity index 100%
rename from doc/doxygen/pages/user_documentation/deck_management/editing_decks_visual.md
rename to doc/doxygen/extra-pages/user_documentation/deck_management/editing_decks_visual.md
diff --git a/doc/doxygen/pages/user_documentation/deck_management/exporting_decks.md b/doc/doxygen/extra-pages/user_documentation/deck_management/exporting_decks.md
similarity index 100%
rename from doc/doxygen/pages/user_documentation/deck_management/exporting_decks.md
rename to doc/doxygen/extra-pages/user_documentation/deck_management/exporting_decks.md
diff --git a/doc/doxygen/pages/user_documentation/deck_management/importing_decks.md b/doc/doxygen/extra-pages/user_documentation/deck_management/importing_decks.md
similarity index 77%
rename from doc/doxygen/pages/user_documentation/deck_management/importing_decks.md
rename to doc/doxygen/extra-pages/user_documentation/deck_management/importing_decks.md
index 4aab7ad2c..e9626d57f 100644
--- a/doc/doxygen/pages/user_documentation/deck_management/importing_decks.md
+++ b/doc/doxygen/extra-pages/user_documentation/deck_management/importing_decks.md
@@ -38,18 +38,7 @@ Selecting this action will open a new text editor dialog with the contents of yo
 
 The import dialog expects each line to be a card with the following format:
 
-`[quantity] Card Name [options]`
-
-- `quantity` is the number of copies and can be written as `2`, `2x` or `2X`. If omitted, a single copy is imported.
-- `options` are appended after the card name and are understood on a best-effort basis:
-  - a set code and collector number, either as `Card Name (SET) 123` or `Card Name (SET) 123-1`
-  - a foil marker, `Card Name *F*`
-- Lines can also carry a `SB:` prefix or a set code prefix (`[SET]`) — Cockatrice tries to stay compatible with the most
-  common deck formats.
-
-Tab-separated exports from third-party apps (such as Delver Lens) are also accepted: any line whose first column is a
-plain quantity treats the following columns as the card name and printer/set metadata (which is discarded), for example
-`2\tCard Name\tSet Name`.
+TODO
 
 Each card should be on a separate line and there should be no empty lines between cards. The first empty line between
 two blocks of cards will be considered as the divider between mainboard and sideboard.
diff --git a/doc/doxygen/pages/user_documentation/index.md b/doc/doxygen/extra-pages/user_documentation/index.md
similarity index 100%
rename from doc/doxygen/pages/user_documentation/index.md
rename to doc/doxygen/extra-pages/user_documentation/index.md
diff --git a/doc/doxygen/pages/user_documentation/settings/beta.md b/doc/doxygen/extra-pages/user_documentation/settings/beta.md
similarity index 100%
rename from doc/doxygen/pages/user_documentation/settings/beta.md
rename to doc/doxygen/extra-pages/user_documentation/settings/beta.md
diff --git a/doc/doxygen/pages/user_documentation/settings/settings_folder.md b/doc/doxygen/extra-pages/user_documentation/settings/settings_folder.md
similarity index 100%
rename from doc/doxygen/pages/user_documentation/settings/settings_folder.md
rename to doc/doxygen/extra-pages/user_documentation/settings/settings_folder.md
diff --git a/doc/doxygen/pages/user_documentation/troubleshooting/enabling_debug_logs.md b/doc/doxygen/extra-pages/user_documentation/troubleshooting/enabling_debug_logs.md
similarity index 97%
rename from doc/doxygen/pages/user_documentation/troubleshooting/enabling_debug_logs.md
rename to doc/doxygen/extra-pages/user_documentation/troubleshooting/enabling_debug_logs.md
index 27c4272f5..7e4196a50 100644
--- a/doc/doxygen/pages/user_documentation/troubleshooting/enabling_debug_logs.md
+++ b/doc/doxygen/extra-pages/user_documentation/troubleshooting/enabling_debug_logs.md
@@ -110,7 +110,6 @@ suffix, e.g. `card_picture_loader.*`, to include all sub categories).
 | ------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------ |
 | Card picture loading (URLs, local file hits/misses, downloads, redirects) | `card_picture_loader.*`                                                                                            |
 | Card database loading and parsing                                         | `card_database`, `card_database.loading`, `card_database.loading.success_or_failure`, `cockatrice_xml.*`           |
-| Card database update (running Oracle, progress, exit status, errors)      | `card_database.update`                                                                                             |
 | Card, set, and deck information                                           | `card_info`, `card_list`, `deck_loader`                                                                            |
 | Startup sequence and update checks                                        | `window_main.startup.*`, `release_channel`, `spoiler_background_updater`                                           |
 | User interface and themes                                                 | `theme_manager`, `sound_engine`, `flow_layout`, `flow_widget.*`, `pixel_map_generator`, `card_info_picture_widget` |
@@ -129,7 +128,6 @@ For example, to investigate why a card database update seems to fail, enable the
 card_database = true
 card_database.loading = true
 card_database.loading.success_or_failure = true
-card_database.update = true
 cockatrice_xml.* = true
 ```
 
diff --git a/doc/doxygen/pages/user_documentation/troubleshooting/fixing_card_pictures.md b/doc/doxygen/extra-pages/user_documentation/troubleshooting/fixing_card_pictures.md
similarity index 100%
rename from doc/doxygen/pages/user_documentation/troubleshooting/fixing_card_pictures.md
rename to doc/doxygen/extra-pages/user_documentation/troubleshooting/fixing_card_pictures.md
diff --git a/doc/doxygen/images/screenshots/classic_database_display.png b/doc/doxygen/images/classic_database_display.png
similarity index 100%
rename from doc/doxygen/images/screenshots/classic_database_display.png
rename to doc/doxygen/images/classic_database_display.png
diff --git a/doc/doxygen/images/screenshots/classic_database_display_add_buttons.png b/doc/doxygen/images/classic_database_display_add_buttons.png
similarity index 100%
rename from doc/doxygen/images/screenshots/classic_database_display_add_buttons.png
rename to doc/doxygen/images/classic_database_display_add_buttons.png
diff --git a/doc/doxygen/images/screenshots/classic_deck_editor.png b/doc/doxygen/images/classic_deck_editor.png
similarity index 100%
rename from doc/doxygen/images/screenshots/classic_deck_editor.png
rename to doc/doxygen/images/classic_deck_editor.png
diff --git a/doc/doxygen/images/cockatrice_logo.svg b/doc/doxygen/images/cockatrice_logo.svg
deleted file mode 100644
index 89ba62dcf..000000000
--- a/doc/doxygen/images/cockatrice_logo.svg
+++ /dev/null
@@ -1,232 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   version="1.0"
-   width="300"
-   height="300"
-   id="svg2"
-   inkscape:version="0.91 r13725"
-   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:svg="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/"
-   sodipodi:docname="cockatrice.svg"
-   xmlns="http://www.w3.org/2000/svg">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1408"
-     id="namedview40"
-     showgrid="false"
-     inkscape:zoom="1.5733333"
-     inkscape:cx="125.52966"
-     inkscape:cy="197.98729"
-     inkscape:window-x="0"
-     inkscape:window-y="32"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2"
-     inkscape:showpageshadow="0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#505050">
-    <inkscape:page
-       x="0"
-       y="0"
-       width="300"
-       height="300"
-       id="page2"
-       margin="0"
-       bleed="0" />
-  </sodipodi:namedview>
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient4265-7-8">
-      <stop
-         id="stop4267-4-8"
-         style="stop-color:#c9fd62;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4269-0-2"
-         style="stop-color:#139740;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="-11.132094"
-       y1="-102.87244"
-       x2="162.79993"
-       y2="297.84183"
-       id="linearGradient3020"
-       xlink:href="#linearGradient4265-7-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.98056945,0,0,0.98063364,2.8185026,3.1345497)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4265-7-8"
-       id="linearGradient2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.98056945,0,0,0.98063364,2.8185026,3.1345497)"
-       x1="-11.132094"
-       y1="-102.87244"
-       x2="162.79993"
-       y2="297.84183" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4265-7-8"
-       id="linearGradient3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.98056945,0,0,0.98063364,2.8185026,3.1345497)"
-       x1="-11.132094"
-       y1="-102.87244"
-       x2="162.79993"
-       y2="297.84183" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4265-7-8"
-       id="linearGradient4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.98056945,0,0,0.98063364,2.8185026,3.1345497)"
-       x1="-11.132094"
-       y1="-102.87244"
-       x2="162.79993"
-       y2="297.84183" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4265-7-8"
-       id="linearGradient5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.98056945,0,0,0.98063364,2.8185026,3.1345497)"
-       x1="-11.132094"
-       y1="-102.87244"
-       x2="162.79993"
-       y2="297.84183" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4265-7-8"
-       id="linearGradient6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.98056945,0,0,0.98063364,2.8185026,3.1345497)"
-       x1="-11.132094"
-       y1="-102.87244"
-       x2="162.79993"
-       y2="297.84183" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4265-7-8"
-       id="linearGradient7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.98056945,0,0,0.98063364,2.8185026,3.1345497)"
-       x1="-11.132094"
-       y1="-102.87244"
-       x2="162.79993"
-       y2="297.84183" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4265-7-8"
-       id="linearGradient8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.98056945,0,0,0.98063364,2.8185026,3.1345497)"
-       x1="-11.132094"
-       y1="-102.87244"
-       x2="162.79993"
-       y2="297.84183" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4265-7-8"
-       id="linearGradient9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.98056945,0,0,0.98063364,2.8185026,3.1345497)"
-       x1="-11.132094"
-       y1="-102.87244"
-       x2="162.79993"
-       y2="297.84183" />
-  </defs>
-  <metadata
-     id="metadata7">
-    <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
-     id="g3026">
-    <g
-       transform="matrix(0.99103064,0,0,0.98943856,1.2668213,1.9022887)"
-       id="layer4"
-       style="display:inline"
-       clip-path="none"
-       inkscape:export-xdpi="91.459999"
-       inkscape:export-ydpi="91.459999">
-      <path
-         style="fill:url(#linearGradient2);fill-opacity:1;fill-rule:nonzero;stroke:#552200;stroke-width:0.980724;stroke-opacity:0"
-         d="m 145.9375,270.70508 c -0.96897,-0.15045 -2.09434,0.0125 -3.57422,0.46094 -1.47988,0.44848 -3.3135,1.18186 -5.69922,2.16796 -4.42543,1.82916 -9.61936,4.11554 -11.54101,5.08008 -1.67967,0.8431 -3.62145,2.14979 -5.14258,3.37305 -0.76057,0.61163 -1.41542,1.20191 -1.88086,1.70312 -0.46545,0.50122 -0.74023,0.91218 -0.74023,1.16602 0,0.26854 2.0094,1.30995 4.46484,2.3125 2.45544,1.00253 5.16156,2.31224 6.01562,2.91211 0.63856,0.44852 1.43533,0.71726 2.40821,0.79883 0.97287,0.0816 2.1231,-0.0231 3.46679,-0.31641 1.34369,-0.29336 2.88182,-0.77688 4.63282,-1.45312 1.75099,-0.67625 3.7134,-1.54618 5.9082,-2.61328 2.24674,-1.09236 4.50133,-2.08473 6.32226,-2.80469 1.82094,-0.71997 3.20854,-1.16602 3.72461,-1.16602 0.95839,0 1.58733,-0.26883 1.79688,-0.64648 0.10478,-0.18883 0.10341,-0.40459 -0.0117,-0.62891 -0.11513,-0.22432 -0.34435,-0.45721 -0.70117,-0.67773 -0.43649,-0.26978 -2.2073,-2.40469 -3.93555,-4.74414 -1.13196,-1.53228 -2.02591,-2.68735 -2.8789,-3.49805 -0.853,-0.8107 -1.6658,-1.27533 -2.63477,-1.42578 z"
-         id="path17078"
-         transform="matrix(1.0090505,0,0,1.0106742,-1.2782867,-1.9225941)" />
-      <path
-         style="fill:url(#linearGradient3);fill-opacity:1;fill-rule:nonzero;stroke:#552200;stroke-width:0.980724;stroke-opacity:0"
-         d="m 145.9375,270.70508 c 0.96897,0.15045 1.78177,0.61508 2.63477,1.42578 0.85299,0.8107 1.74694,1.96577 2.8789,3.49805 1.72825,2.33945 3.49906,4.47436 3.93555,4.74414 0.35682,0.22052 0.58604,0.45341 0.70117,0.67773 0.11513,0.22432 0.1165,0.44008 0.0117,0.62891 -0.20955,0.37765 -0.83849,0.64648 -1.79688,0.64648 -0.51607,0 -1.90367,0.44605 -3.72461,1.16602 -1.82093,0.71996 -4.07552,1.71233 -6.32226,2.80469 -2.1948,1.0671 -4.15721,1.93703 -5.9082,2.61328 -1.751,0.67624 -3.28913,1.15976 -4.63282,1.45312 -1.34369,0.29336 -2.49392,0.39797 -3.46679,0.31641 -0.97288,-0.0816 -1.76965,-0.35031 -2.40821,-0.79883 -0.85406,-0.59987 -3.56018,-1.90958 -6.01562,-2.91211 -2.45544,-1.00255 -4.46484,-2.04396 -4.46484,-2.3125 0,-0.25384 0.27478,-0.6648 0.74023,-1.16602 0.46544,-0.50121 1.12029,-1.09149 1.88086,-1.70312 1.52113,-1.22326 3.46291,-2.52995 5.14258,-3.37305 1.92165,-0.96454 7.11558,-3.25092 11.54101,-5.08008 2.38572,-0.9861 4.21934,-1.71948 5.69922,-2.16796 1.47988,-0.44849 2.60525,-0.61139 3.57422,-0.46094 z"
-         id="path17076"
-         transform="matrix(1.0090505,0,0,1.0106742,-1.2782867,-1.9225941)" />
-      <path
-         style="fill:url(#linearGradient4);fill-opacity:1;fill-rule:nonzero;stroke:#552200;stroke-width:0.980724;stroke-opacity:0"
-         d="m 146.58203,238.53906 -1.60742,2.22071 c -2.51827,3.48195 -4.20925,5.70863 -5.79297,7.48437 -1.58371,1.77574 -3.05881,3.10096 -5.14453,4.78125 -2.53188,2.03972 -6.8833,5.0631 -9.66992,6.71875 -2.78662,1.65566 -7.327,4.67492 -10.08985,6.70898 -2.20673,1.62467 -3.41649,2.56803 -3.90625,3.17774 -0.24487,0.30485 -0.3107,0.52629 -0.23047,0.70703 0.0802,0.18074 0.30665,0.32179 0.64258,0.46484 0.66118,0.28154 1.84625,0.42529 3.36524,0.44922 1.51898,0.0239 3.37142,-0.0731 5.36914,-0.26953 1.99772,-0.1964 4.14091,-0.49358 6.23828,-0.87304 2.09737,-0.37947 4.14886,-0.83997 5.9668,-1.36524 1.92165,-0.55522 4.47542,-1.45083 7.04101,-2.44531 2.5656,-0.99448 5.1423,-2.08933 7.11328,-3.04297 2.05628,-0.9949 3.68039,-1.84524 4.95899,-2.66406 1.27859,-0.81883 2.21201,-1.60441 2.88867,-2.47266 0.67666,-0.86825 1.0972,-1.81778 1.34766,-2.96094 0.25045,-1.14316 0.33203,-2.48143 0.33203,-4.125 0,-1.23283 -0.12655,-2.38114 -0.38086,-3.44922 -0.25432,-1.06807 -0.63696,-2.05452 -1.14844,-2.96289 -0.51148,-0.90836 -1.15235,-1.73848 -1.92383,-2.49218 -0.77148,-0.7537 -1.67466,-1.43108 -2.70898,-2.03516 z"
-         id="path17074"
-         transform="matrix(1.0090505,0,0,1.0106742,-1.2782867,-1.9225941)" />
-      <path
-         style="fill:url(#linearGradient5);fill-opacity:1;fill-rule:nonzero;stroke:#552200;stroke-width:0.980724;stroke-opacity:0"
-         d="m 169.59375,3.1191406 h -12.15234 c 0.18561,0.8242598 0.37827,1.6201544 0.47265,2.6796875 0.13194,1.4811436 0.18708,3.2281495 0.19141,5.3359379 0.006,3.199343 0.0753,5.258996 0.2793,6.677734 0.20399,1.418738 0.54292,2.197126 1.08789,2.833984 0.37157,0.434218 0.83718,0.827093 1.28906,1.113282 0.45188,0.286189 0.88908,0.464843 1.20312,0.464843 0.39583,0 0.79318,-0.109893 1.18555,-0.320312 0.39237,-0.210419 0.78015,-0.520663 1.16016,-0.921875 0.76001,-0.802425 1.48545,-1.968166 2.14257,-3.416016 0.65713,-1.44785 1.24555,-3.178959 1.72852,-5.115234 0.48297,-1.936275 0.86204,-4.0780031 1.09961,-6.3457032 z"
-         id="path17072"
-         transform="matrix(1.0090505,0,0,1.0106742,-1.2782867,-1.9225941)" />
-      <path
-         style="fill:url(#linearGradient6);fill-opacity:1;fill-rule:nonzero;stroke:#552200;stroke-width:0.980724;stroke-opacity:0"
-         d="m 297.14258,94.369141 v -42.21875 c 0,-27.163552 -21.87052,-49.0312504 -49.03906,-49.0312504 h -76.82618 l 0.30274,0.4707032 c 0.54125,0.8394207 0.92965,1.6509379 1.1543,2.5097656 0.22464,0.8588277 0.2856,1.7646749 0.17773,2.7949218 -0.10788,1.030247 -0.38548,2.1853838 -0.8418,3.5390628 -0.45631,1.353678 -1.09143,2.907206 -1.91211,4.736328 -1.28315,2.859884 -2.33203,5.341914 -2.33203,5.515625 0,0.173705 1.32047,0.314453 2.9336,0.314453 0.94995,0 1.79653,-0.09793 2.57031,-0.316406 0.77377,-0.21848 1.47484,-0.556901 2.1289,-1.035156 0.65407,-0.478256 1.26072,-1.095672 1.85157,-1.875 0.59084,-0.779329 1.1659,-1.7201 1.75,-2.841797 0.52153,-1.001552 0.99817,-1.755257 1.34765,-2.16211 0.17474,-0.203426 0.31764,-0.319694 0.41797,-0.33789 0.10033,-0.0182 0.15713,0.0625 0.16211,0.253906 0.0144,0.550704 -0.15937,1.28807 -0.48242,2.142578 -0.32305,0.854508 -0.79361,1.826072 -1.375,2.845703 -1.16277,2.039263 -2.76477,4.269039 -4.48633,6.136719 -1.74023,1.887917 -2.97428,3.623383 -2.74219,3.855469 0.23022,0.230216 2.01341,0.05876 4.01172,-0.285157 1.99831,-0.343917 4.21193,-0.86045 5.30469,-1.318359 0.4503,-0.188692 0.78382,-0.252284 1,-0.205078 0.21618,0.04721 0.3152,0.20459 0.29883,0.46289 -0.0327,0.516601 -0.52889,1.430426 -1.48242,2.642579 -0.56408,0.717113 -1.24892,1.261874 -2.20313,1.699218 -0.95421,0.437345 -2.17808,0.769122 -3.81445,1.060547 -2.47703,0.441154 -4.38888,0.869761 -5.7832,1.375 -0.69717,0.25262 -1.26487,0.525315 -1.70899,0.826172 -0.44412,0.300857 -0.76397,0.631381 -0.9668,1.001953 -0.20282,0.370572 -0.28842,0.780424 -0.26171,1.242188 0.0267,0.461764 0.16566,0.974394 0.41015,1.548828 0.48898,1.148867 1.40185,2.545028 2.69141,4.273437 1.33249,1.785939 2.66822,4.244858 3.68359,6.619141 0.50769,1.187142 0.93516,2.351933 1.24219,3.402344 0.30703,1.05041 0.49407,1.986469 0.51953,2.710937 0.0132,0.374308 0.32446,0.954123 0.91406,1.71875 0.58961,0.764628 1.45712,1.713914 2.58203,2.828125 2.24983,2.228423 5.52949,5.1157 9.67383,8.498047 4.83821,3.948617 8.62259,7.295275 11.33594,10.021484 1.35668,1.363105 2.44546,2.570877 3.26367,3.621094 0.81821,1.050218 1.36572,1.943309 1.64063,2.675782 0.44077,1.17434 0.67455,2.134765 0.51953,2.134765 -0.15494,0 -2.54945,-1.061825 -5.32227,-2.359375 -1.83308,-0.857801 -3.5646,-1.556059 -5.25195,-2.103516 -1.68735,-0.547456 -3.33188,-0.944151 -4.99024,-1.199218 -1.65836,-0.255067 -3.33006,-0.368978 -5.07617,-0.34961 -1.7461,0.01937 -3.56504,0.171417 -5.51562,0.447266 -3.51403,0.496946 -6.5047,1.018395 -6.64453,1.158203 -0.25777,0.257777 0.49044,2.704412 1.66406,5.804688 1.17362,3.100275 2.773,6.854526 4.21484,9.724609 1.32806,2.64358 2.03547,4.13336 2.25782,5.01172 0.11117,0.43918 0.1003,0.72533 -0.0137,0.92578 -0.11397,0.20045 -0.33178,0.31533 -0.63672,0.41211 -0.54579,0.17323 -0.86046,0.40772 -0.98437,0.84766 -0.12391,0.43993 -0.0574,1.08492 0.1582,2.08398 0.33916,1.5715 0.37354,4.04137 0.20703,6.11719 -0.0833,1.03791 -0.21585,1.97799 -0.38672,2.6582 -0.17086,0.68021 -0.37871,1.09961 -0.61132,1.09961 -0.19202,0 -0.36759,-0.20266 -0.49414,-0.5293 -0.12656,-0.32664 -0.20508,-0.7759 -0.20508,-1.27148 0,-0.49558 -0.49738,-1.94588 -1.30078,-3.88086 -0.80341,-1.93499 -1.9119,-4.35466 -3.13086,-6.79492 -1.87529,-3.75416 -3.22705,-6.220075 -4.77735,-8.423831 -1.55029,-2.203755 -3.29864,-4.145514 -5.9707,-6.855468 -1.73687,-1.761501 -3.43001,-3.362445 -4.75781,-4.523438 -1.3278,-1.160993 -2.29064,-1.882812 -2.56836,-1.882812 -0.2525,0 -0.43477,0.218992 -0.54492,0.730468 -0.11015,0.511477 -0.14822,1.316445 -0.11133,2.488282 0.0738,2.343674 0.44668,6.15673 1.13672,12.035156 0.21264,1.811513 0.29072,2.822593 0.125,3.441403 -0.0829,0.30941 -0.22689,0.51938 -0.44531,0.6836 -0.21843,0.16422 -0.51127,0.28131 -0.89258,0.40234 -0.49463,0.15699 -1.05433,0.17099 -1.65821,0.0508 -0.60387,-0.12021 -1.25358,-0.37322 -1.92968,-0.75 -1.35222,-0.75356 -2.81142,-2.00018 -4.23047,-3.656248 -0.61436,-0.71697 -1.35232,-1.311183 -2.15625,-1.769531 -0.80394,-0.458349 -1.67444,-0.780076 -2.55469,-0.957032 -0.88025,-0.176955 -1.76998,-0.207285 -2.61328,-0.08008 -0.84331,0.127208 -1.63893,0.411093 -2.33203,0.865235 -0.54894,0.359671 -1.17914,1.091415 -1.76953,2.011718 -0.59039,0.920308 -1.14049,2.029408 -1.53516,3.140628 -0.37824,1.06497 -0.74548,1.91631 -1.13086,2.57617 -0.38538,0.65987 -0.79063,1.1289 -1.24805,1.42578 -0.45742,0.29689 -0.96619,0.42241 -1.56054,0.39844 -0.59436,-0.024 -1.27413,-0.19729 -2.07032,-0.5 -0.97053,-0.369 -1.81965,-0.62839 -2.55078,-0.76953 -0.73113,-0.14114 -1.34391,-0.16583 -1.83593,-0.0664 -0.49203,0.0994 -0.86397,0.32308 -1.11719,0.67578 -0.25323,0.35271 -0.38762,0.83443 -0.40235,1.45313 -0.0294,1.2374 0.41712,3.02078 1.33985,5.39844 0.92273,2.37766 2.32282,5.35107 4.19531,8.9707 0.81696,1.57919 1.48438,3.73413 1.48438,4.78906 0,0.67987 0.20153,1.28266 0.64648,1.86719 0.44495,0.58453 1.13401,1.14991 2.11133,1.75391 0.94052,0.58128 1.73915,1.1747 2.40234,1.78515 0.66319,0.61046 1.19038,1.23816 1.58399,1.89063 0.3936,0.65247 0.65338,1.32978 0.78515,2.03711 0.13177,0.70732 0.13599,1.44568 0.0137,2.2207 -0.0876,0.55496 -0.12754,1.02024 -0.084,1.46094 0.0436,0.44069 0.16991,0.85631 0.41406,1.3125 0.48831,0.91237 1.44691,1.98542 3.1543,3.73828 1.03989,1.06759 1.90442,2.08552 2.5957,3.06836 0.69128,0.98284 1.21003,1.92975 1.5625,2.85351 0.35248,0.92377 0.53709,1.82449 0.56055,2.71485 0.0235,0.89036 -0.11441,1.77166 -0.41016,2.65429 -0.1527,0.45573 -0.24967,0.83699 -0.26562,1.19532 -0.016,0.35832 0.0488,0.69386 0.21679,1.05664 0.33591,0.72554 1.08695,1.56156 2.44141,2.91601 l 3.08985,3.08789 0.26562,8.15235 c 0.12625,3.85644 0.22667,5.93889 0.58398,7.45703 0.17866,0.75907 0.42258,1.37834 0.76563,2.00586 0.34305,0.62752 0.78476,1.2645 1.36328,2.0625 1.34514,1.8554 2.77658,3.37304 3.17969,3.37304 0.4031,0 3.47935,-3.66852 6.83789,-8.15234 2.81134,-3.75327 6.00001,-7.54259 9.49414,-11.30469 3.49413,-3.76209 7.29545,-7.49601 11.32812,-11.13672 4.03268,-3.6407 8.29762,-7.18902 12.72461,-10.57812 4.42699,-3.3891 9.01434,-6.61968 13.69141,-9.62695 2.84729,-1.83077 6.32116,-3.87255 10.35156,-6.0918 4.03041,-2.21925 8.61852,-4.61592 13.69727,-7.15625 10.1575,-5.08066 22.27608,-10.73675 35.81836,-16.69727 10.22052,-4.49845 19.15899,-8.585222 27.02734,-12.378904 0.36908,-0.17795 0.6024,-0.321374 0.9668,-0.498047 z"
-         id="path17070"
-         transform="matrix(1.0090505,0,0,1.0106742,-1.2782867,-1.9225941)" />
-      <path
-         style="fill:url(#linearGradient7);fill-opacity:1;fill-rule:nonzero;stroke:#552200;stroke-width:0.980724;stroke-opacity:0"
-         d="m 246.15234,297.31055 h 1.95118 c 27.16854,0 49.03906,-21.86965 49.03906,-49.03321 V 106.26953 c -2.01485,1.10552 -3.2325,1.91738 -6.0586,3.37305 -7.03372,3.62294 -17.34552,8.72431 -34.74609,17.26758 -9.29671,4.56448 -17.328,8.6755 -24.4043,12.53515 -7.07629,3.85965 -13.1968,7.4683 -18.67187,11.02539 -5.47507,3.5571 -10.3058,7.06193 -14.79883,10.71875 -4.49303,3.65682 -8.64912,7.46423 -12.7793,11.62305 -2.23487,2.25038 -4.26949,4.40268 -6.16797,6.53906 -1.89847,2.13638 -3.66079,4.25769 -5.35351,6.44922 -1.69272,2.19153 -3.31596,4.4533 -4.93359,6.86914 -1.61764,2.41584 -3.22916,4.98562 -4.90235,7.79492 -2.78076,4.66888 -6.10012,9.61588 -7.37695,10.99219 -0.78661,0.8479 -1.39305,1.78762 -1.81641,2.80469 -0.42336,1.01707 -0.66422,2.11053 -0.72265,3.26367 -0.0584,1.15314 0.0649,2.36694 0.37304,3.62305 0.30818,1.2561 0.80011,2.55489 1.47657,3.88086 0.90507,1.7741 1.35954,2.69147 1.36718,3.10742 0.004,0.20797 -0.10417,0.2889 -0.32226,0.29101 -0.21809,0.002 -0.54601,-0.0748 -0.98438,-0.18945 -0.48343,-0.12642 -0.92121,-0.11398 -1.30859,0.0195 -0.38738,0.13352 -0.72483,0.38769 -1.01172,0.74024 -0.57377,0.7051 -0.94277,1.80672 -1.08789,3.14257 -0.14512,1.33586 -0.0671,2.90549 0.25195,4.54493 0.31907,1.63943 0.88042,3.34902 1.69922,4.96484 0.92208,1.81965 1.75516,3.19334 2.48828,4.12109 0.73312,0.92775 1.36636,1.40934 1.88282,1.44336 0.25822,0.017 0.48668,-0.0784 0.68554,-0.28515 0.19887,-0.20676 0.36787,-0.52432 0.50391,-0.95508 0.27208,-0.86153 0.41406,-2.17079 0.41406,-3.92969 0,-1.56821 0.11526,-3.04898 0.3457,-4.4375 0.23044,-1.38852 0.5759,-2.68604 1.03516,-3.89062 0.45926,-1.20458 1.03229,-2.31564 1.71875,-3.33203 0.68646,-1.0164 1.48639,-1.93775 2.39844,-2.76172 0.89667,-0.8101 1.70024,-1.42953 2.45117,-1.86328 0.75093,-0.43376 1.44941,-0.68108 2.13477,-0.7461 0.68535,-0.065 1.35863,0.0515 2.05859,0.34766 0.69995,0.29612 1.42597,0.77027 2.2207,1.41992 l 2.33008,1.9043 -3.63672,-0.13282 c -0.81647,-0.03 -1.56863,0.0112 -2.25781,0.125 -0.68918,0.11383 -1.31535,0.3004 -1.88086,0.56446 -0.56551,0.26405 -1.07015,0.60466 -1.51563,1.02539 -0.44547,0.42072 -0.83109,0.92202 -1.16015,1.50586 -0.65812,1.16766 -1.08849,2.66667 -1.30274,4.52539 -0.21425,1.85872 -0.21231,4.07646 -0.0117,6.67773 0.26257,3.40475 0.63502,6.34794 0.82813,6.54102 0.19308,0.19307 3.1584,-0.7314 6.58984,-2.05469 2.10158,-0.81045 3.98215,-1.41955 5.67188,-1.83008 1.68973,-0.41053 3.18821,-0.62174 4.52148,-0.63281 1.33327,-0.0111 2.50297,0.17652 3.53516,0.56445 1.03219,0.38794 1.92641,0.97525 2.71289,1.76172 1.24825,1.24825 2.26953,2.64754 2.26953,3.10742 0,0.26404 0.004,0.46064 -0.0527,0.58789 -0.0563,0.12726 -0.17102,0.1843 -0.41016,0.16407 -0.47829,-0.0405 -1.44902,-0.38735 -3.41797,-1.08203 -1.21966,-0.43033 -2.40158,-0.7468 -3.54492,-0.95118 -1.14334,-0.20438 -2.24844,-0.29548 -3.31641,-0.27343 -1.06796,0.022 -2.09828,0.15729 -3.09179,0.40625 -0.99352,0.24895 -1.95109,0.61153 -2.8711,1.08789 -0.92001,0.47635 -1.80295,1.06529 -2.65039,1.76953 -0.84743,0.70423 -1.65974,1.52248 -2.43554,2.45508 -0.77581,0.9326 -1.51561,1.98112 -2.22071,3.14257 -0.7051,1.16145 -1.37442,2.43734 -2.00976,3.82813 -0.50359,1.10235 -1.00526,2.55542 -1.46094,4.14844 -0.45568,1.59301 -0.86544,3.32483 -1.18945,4.98047 -0.32401,1.65563 -0.56135,3.23516 -0.66993,4.52539 -0.10857,1.29022 -0.0891,2.29229 0.10157,2.78906 0.16654,0.43399 0.50736,0.82908 0.99609,1.17969 0.48873,0.35061 1.12655,0.65574 1.88672,0.90625 1.52034,0.50101 3.53243,0.7849 5.83398,0.78515 1.43601,1.5e-4 3.30642,-0.31978 6.01758,-1.07617 2.71116,-0.75639 6.26189,-1.94935 11.0625,-3.68945 7.23152,-2.62128 16.33516,-5.59336 20.22852,-6.60547 2.70932,-0.70432 5.37768,-1.25468 7.98047,-1.65625 2.60278,-0.40157 5.13875,-0.65505 7.58203,-0.76563 2.44327,-0.11057 4.79459,-0.0788 7.02539,0.0899 2.2308,0.16866 4.34128,0.47401 6.30664,0.91015 1.96536,0.43615 3.78469,1.00344 5.43164,1.69532 1.64695,0.69187 3.12287,1.50946 4.39844,2.44531 1.27556,0.93585 2.35191,1.99013 3.20312,3.1582 0.85122,1.16807 1.47572,2.44936 1.84961,3.83789 0.27889,1.03574 0.34517,2.20952 0.22266,3.48633 -0.12251,1.27681 -0.43272,2.65669 -0.90821,4.10156 -0.47548,1.44488 -1.11645,2.95616 -1.89648,4.4961 -0.78003,1.53994 -1.70017,3.10791 -2.73633,4.66992 -0.29776,0.44887 -0.66999,0.88326 -0.98633,1.33008 z"
-         id="path17068"
-         transform="matrix(1.0090505,0,0,1.0106742,-1.2782867,-1.9225941)" />
-      <path
-         style="fill:url(#linearGradient8);fill-opacity:1;fill-rule:nonzero;stroke:#552200;stroke-width:0.980724;stroke-opacity:0"
-         d="m 2.8984375,172.30469 v 51.52929 c 1.0114478,-0.95471 2.0020646,-1.92993 3.0859375,-2.8125 1.6523774,-1.34547 3.3893998,-2.60693 5.210937,-3.78515 1.821538,-1.17822 3.727045,-2.27369 5.71875,-3.28516 1.991706,-1.01147 4.069541,-1.93992 6.232422,-2.78515 2.162882,-0.84524 4.411029,-1.60761 6.746094,-2.28711 2.335066,-0.67951 4.755415,-1.27673 7.263672,-1.79102 2.508257,-0.51429 5.104653,-0.94533 7.787109,-1.29492 1.11689,-0.14556 2.08578,-0.3529 2.748047,-0.56836 0.662268,-0.21546 1.01833,-0.43975 0.90625,-0.62109 -0.22415,-0.36271 -3.570607,-2.29094 -7.435547,-4.28711 -2.979125,-1.53866 -5.922109,-3.19075 -8.820312,-4.94727 -2.898203,-1.75652 -5.752211,-3.61931 -8.556641,-5.58203 -2.80443,-1.96272 -5.558054,-4.02439 -8.255859,-6.18164 -2.697806,-2.15725 -5.339639,-4.40988 -7.9179689,-6.75 -1.6118376,-1.46292 -3.1518263,-3.0201 -4.7128906,-4.55078 z"
-         id="path17066"
-         transform="matrix(1.0090505,0,0,1.0106742,-1.2782867,-1.9225941)" />
-      <path
-         style="fill:url(#linearGradient9);fill-opacity:1;fill-rule:nonzero;stroke:#552200;stroke-width:0.980724;stroke-opacity:0"
-         d="M 132.29102,3.1191406 H 51.939453 c -27.168542,0 -49.0410155,21.8676984 -49.0410155,49.0312504 v 21.429687 c 4.0779876,3.369331 8.2016545,6.786486 12.1699215,9.966797 5.567597,4.462071 10.776706,8.528102 14.923829,11.611328 2.196994,1.63338 4.241351,3.266976 6.154296,4.935547 1.912945,1.66857 3.69487,3.37205 5.367188,5.14844 1.672318,1.77638 3.235824,3.6252 4.710937,5.58203 1.475114,1.95682 2.862262,4.02253 4.183594,6.23242 1.321332,2.20989 2.576136,4.56403 3.787109,7.09961 1.210974,2.53558 2.377447,5.25166 3.521485,8.18555 1.144037,2.93388 2.266194,6.08541 3.386719,9.49023 1.120524,3.40482 2.240425,7.06334 3.380859,11.01172 2.24573,7.77511 4.242446,14.24938 6.095703,19.63867 1.853257,5.3893 3.562877,9.69424 5.232422,13.12696 0.834772,1.71635 1.658341,3.21379 2.486328,4.52148 0.827987,1.30769 1.660515,2.42427 2.507813,3.37695 0.847297,0.95268 1.710813,1.74126 2.603515,2.39258 0.892702,0.65132 1.813142,1.16669 2.777344,1.57031 0.95318,0.39901 1.856717,0.63542 2.748047,0.69532 0.891329,0.0599 1.770872,-0.0574 2.679687,-0.36329 0.908816,-0.30593 1.845925,-0.80154 2.851563,-1.5 1.005638,-0.69846 2.079921,-1.5991 3.261719,-2.71679 1.705427,-1.61292 3.152364,-3.3785 4.339844,-5.28906 1.18748,-1.91057 2.1166,-3.96746 2.7832,-6.16602 0.66661,-2.19856 1.07204,-4.53873 1.21485,-7.01563 0.1428,-2.4769 0.0226,-5.09035 -0.36133,-7.83593 -0.26817,-1.91776 -0.54754,-3.612 -0.91406,-5.33789 -0.36653,-1.72589 -0.82026,-3.48218 -1.43946,-5.52539 -1.23839,-4.08644 -3.13754,-9.31759 -6.312498,-17.72852 -2.982139,-7.90007 -6.288609,-17.33313 -7.349609,-20.96289 -0.600347,-2.05382 -1.098422,-4.22119 -1.486328,-6.42383 -0.387906,-2.20264 -0.666443,-4.44182 -0.830078,-6.63476 -0.163636,-2.19295 -0.213088,-4.34051 -0.140625,-6.365239 0.07246,-2.024727 0.267501,-3.925052 0.58789,-5.623047 0.371223,-1.967386 0.644281,-3.82098 0.820313,-5.533203 0.176032,-1.712223 0.254766,-3.283203 0.236328,-4.685547 -0.01844,-1.402343 -0.133516,-2.636079 -0.345703,-3.673828 -0.212187,-1.037748 -0.522517,-1.879609 -0.927734,-2.498047 -0.40727,-0.621574 -0.690047,-1.181226 -0.837891,-1.732421 -0.147844,-0.551196 -0.159781,-1.094126 -0.02344,-1.681641 0.136343,-0.587516 0.41994,-1.220638 0.865234,-1.951172 0.445293,-0.730534 1.051073,-1.558812 1.830078,-2.539063 0.663465,-0.834865 1.169156,-1.513143 1.525391,-2.11914 0.356234,-0.605997 0.564133,-1.140004 0.634765,-1.683594 0.07063,-0.543589 0.0039,-1.096499 -0.189453,-1.74414 -0.193344,-0.647642 -0.513526,-1.390441 -0.949219,-2.308594 l -1.277343,-2.691406 2.830078,-2.333985 c 1.039735,-0.857041 1.747546,-1.592088 2.195312,-2.320312 0.447766,-0.728225 0.634766,-1.449255 0.634766,-2.283203 0,-0.727683 0.210296,-1.50727 0.685547,-2.400391 0.475251,-0.893121 1.21627,-1.900331 2.277344,-3.082031 2.122147,-2.363401 5.527385,-5.427037 10.656255,-9.683594 1.9917,-1.652965 3.78519,-3.241824 5.35742,-4.736328 1.57223,-1.494504 2.92193,-2.895539 4.02148,-4.169922 1.09955,-1.274383 1.94977,-2.423413 2.52344,-3.416016 0.57367,-0.992602 0.87065,-1.827399 0.86524,-2.476562 -0.006,-0.714276 -0.0822,-1.298103 -0.25391,-1.763672 -0.17171,-0.465569 -0.43762,-0.812641 -0.82031,-1.058594 -0.3827,-0.245953 -0.88253,-0.389885 -1.52149,-0.445312 -0.63896,-0.05543 -1.41886,-0.02398 -2.35937,0.08203 -0.9829,0.110787 -1.87562,0.133598 -2.52344,0.08008 -0.64782,-0.05352 -1.04883,-0.183008 -1.04883,-0.375 0,-0.256238 0.43976,-0.716646 1.12695,-1.263672 0.6872,-0.547026 1.62112,-1.18 2.60743,-1.78125 0.98631,-0.601249 2.02451,-1.170936 2.92187,-1.589844 0.89736,-0.418907 1.65388,-0.6875 2.07422,-0.6875 0.57842,0 1.22711,0.132785 1.9043,0.371094 0.67719,0.238309 1.38361,0.582872 2.07226,1.005859 1.3773,0.845976 2.68862,2.006625 3.58789,3.269532 0.80246,1.126945 1.59376,1.838954 2.32813,2.166015 0.36718,0.163531 0.72133,0.231545 1.05469,0.207032 0.33335,-0.02451 0.64527,-0.141098 0.93359,-0.345703 0.57665,-0.409212 1.05353,-1.172031 1.38281,-2.253907 0.32929,-1.081875 0.51162,-2.482899 0.50391,-4.173828 -0.005,-1.179981 -0.14057,-2.356851 -0.39258,-3.501953 -0.252,-1.1451024 -0.61989,-2.2593815 -1.09375,-3.3144531 -0.39071,-0.8699266 -0.8957,-1.6668897 -1.42187,-2.4414063 z"
-         id="path17064"
-         transform="matrix(1.0090505,0,0,1.0106742,-1.2782867,-1.9225941)" />
-      <path
-         style="fill:url(#linearGradient3020);fill-opacity:1;fill-rule:nonzero;stroke:#552200;stroke-width:0.980724;stroke-opacity:0"
-         d="m 153.55273,3.1191406 h -11.15429 c 0.42592,0.5516469 0.841,1.1146781 1.18164,1.7597656 0.42725,0.8091212 0.78731,1.6907388 1.08008,2.6464844 0.58552,1.9114913 0.90185,4.1158654 0.94726,6.6113284 0.0497,2.733247 0.32733,4.973187 0.61719,4.976562 0.28988,0.0033 1.74002,-1.138818 3.22266,-2.537109 1.05399,-0.994044 1.91444,-2.164461 2.57617,-3.492188 0.66173,-1.327726 1.1252,-2.813065 1.38867,-4.4374996 0.26347,-1.6244351 0.32633,-3.3873131 0.18555,-5.2714844 -0.006,-0.080439 -0.0382,-0.1749821 -0.0449,-0.2558594 z"
-         id="path17062"
-         transform="matrix(1.0090505,0,0,1.0106742,-1.2782867,-1.9225941)" />
-      <path
-         style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.980724;stroke-opacity:0"
-         d="m 153.55273,3.1191406 c 0.007,0.080877 0.0389,0.1754204 0.0449,0.2558594 0.14078,1.8841713 0.0779,3.6470493 -0.18555,5.2714844 -0.26347,1.6244346 -0.72694,3.1097736 -1.38867,4.4374996 -0.66173,1.327727 -1.52218,2.498144 -2.57617,3.492188 -1.48264,1.398291 -2.93278,2.540409 -3.22266,2.537109 -0.28986,-0.0034 -0.56749,-2.243315 -0.61719,-4.976562 -0.0454,-2.495463 -0.36174,-4.6998371 -0.94726,-6.6113284 -0.29277,-0.9557456 -0.65283,-1.8373632 -1.08008,-2.6464844 -0.34064,-0.6450875 -0.75572,-1.2081187 -1.18164,-1.7597656 h -10.10742 c 0.52617,0.7745166 1.03116,1.5714797 1.42187,2.4414063 0.47386,1.0550716 0.84175,2.1693507 1.09375,3.3144531 0.25201,1.145102 0.3872,2.321972 0.39258,3.501953 0.008,1.690929 -0.17462,3.091953 -0.50391,4.173828 -0.32928,1.081876 -0.80616,1.844695 -1.38281,2.253907 -0.28832,0.204605 -0.60024,0.321189 -0.93359,0.345703 -0.33336,0.02451 -0.68751,-0.0435 -1.05469,-0.207032 -0.73437,-0.327061 -1.52567,-1.03907 -2.32813,-2.166015 -0.89927,-1.262907 -2.21059,-2.423556 -3.58789,-3.269532 -0.68865,-0.422987 -1.39507,-0.76755 -2.07226,-1.005859 -0.67719,-0.238309 -1.32588,-0.371094 -1.9043,-0.371094 -0.42034,0 -1.17686,0.268593 -2.07422,0.6875 -0.89736,0.418908 -1.93556,0.988595 -2.92187,1.589844 -0.98631,0.60125 -1.92023,1.234224 -2.60743,1.78125 -0.68719,0.547026 -1.12695,1.007434 -1.12695,1.263672 0,0.191992 0.40101,0.32148 1.04883,0.375 0.64782,0.05352 1.54054,0.03071 2.52344,-0.08008 0.94051,-0.106008 1.72041,-0.137459 2.35937,-0.08203 0.63896,0.05543 1.13879,0.199359 1.52149,0.445312 0.38269,0.245953 0.6486,0.593025 0.82031,1.058594 0.17171,0.465569 0.24791,1.049396 0.25391,1.763672 0.005,0.649163 -0.29157,1.48396 -0.86524,2.476562 -0.57367,0.992603 -1.42389,2.141633 -2.52344,3.416016 -1.09955,1.274383 -2.44925,2.675418 -4.02148,4.169922 -1.57223,1.494504 -3.36572,3.083363 -5.35742,4.736328 -5.12887,4.256557 -8.534105,7.320193 -10.656252,9.683594 -1.061074,1.1817 -1.802093,2.18891 -2.277344,3.082031 -0.475251,0.893121 -0.685547,1.672708 -0.685547,2.400391 0,0.833948 -0.187,1.554978 -0.634766,2.283203 -0.447766,0.728224 -1.155577,1.463271 -2.195312,2.320312 l -2.830078,2.333985 1.277343,2.691406 c 0.435693,0.918153 0.755875,1.660952 0.949219,2.308594 0.193344,0.647641 0.260085,1.200551 0.189453,1.74414 -0.07063,0.54359 -0.278531,1.077597 -0.634765,1.683594 -0.356235,0.605997 -0.861926,1.284275 -1.525391,2.11914 -0.779005,0.980251 -1.384785,1.808529 -1.830078,2.539063 -0.445294,0.730534 -0.728891,1.363656 -0.865234,1.951172 -0.136344,0.587515 -0.124407,1.130445 0.02344,1.681641 0.147844,0.551195 0.430621,1.110847 0.837891,1.732421 0.405217,0.618438 0.715547,1.460299 0.927734,2.498047 0.212187,1.037749 0.327266,2.271485 0.345703,3.673828 0.01844,1.402344 -0.0603,2.973324 -0.236328,4.685547 -0.176032,1.712223 -0.44909,3.565817 -0.820313,5.533203 -0.320389,1.697995 -0.515427,3.59832 -0.58789,5.623047 -0.07246,2.02473 -0.02301,4.17229 0.140625,6.36524 0.163635,2.19294 0.442172,4.43212 0.830078,6.63476 0.387906,2.20264 0.885981,4.37001 1.486328,6.42383 1.061,3.62976 4.36747,13.06282 7.349609,20.96289 3.174955,8.41093 5.074105,13.64208 6.312495,17.72852 0.6192,2.04321 1.07293,3.7995 1.43946,5.52539 0.36652,1.72589 0.64589,3.42013 0.91406,5.33789 0.38392,2.74558 0.50413,5.35903 0.36133,7.83593 -0.14281,2.4769 -0.54824,4.81707 -1.21485,7.01563 -0.6666,2.19856 -1.59572,4.25545 -2.7832,6.16602 -1.18748,1.91056 -2.634414,3.67614 -4.339841,5.28906 -1.181798,1.11769 -2.256081,2.01833 -3.261719,2.71679 -1.005638,0.69846 -1.942747,1.19407 -2.851563,1.5 -0.908815,0.30594 -1.788358,0.42318 -2.679687,0.36329 -0.89133,-0.0599 -1.794867,-0.29631 -2.748047,-0.69532 -0.964202,-0.40362 -1.884642,-0.91899 -2.777344,-1.57031 -0.892702,-0.65132 -1.756218,-1.4399 -2.603515,-2.39258 -0.847298,-0.95268 -1.679826,-2.06926 -2.507813,-3.37695 -0.827987,-1.30769 -1.651556,-2.80513 -2.486328,-4.52148 -1.669545,-3.43272 -3.379165,-7.73766 -5.232422,-13.12696 -1.853257,-5.38929 -3.849973,-11.86356 -6.095703,-19.63867 -1.140434,-3.94838 -2.260335,-7.6069 -3.380859,-11.01172 -1.120525,-3.40482 -2.242682,-6.55635 -3.386719,-9.49023 -1.144038,-2.93389 -2.310511,-5.64997 -3.521485,-8.18555 -1.210973,-2.53558 -2.465777,-4.88972 -3.787109,-7.09961 -1.321332,-2.20989 -2.70848,-4.2756 -4.183594,-6.23242 -1.475113,-1.95683 -3.038619,-3.80565 -4.710937,-5.58203 -1.672318,-1.77639 -3.454243,-3.47987 -5.367188,-5.14844 C 34.233539,98.425179 32.189182,96.791583 29.992188,95.158203 25.845065,92.074977 20.635956,88.008946 15.068359,83.546875 11.100092,80.366564 6.9764251,76.949409 2.8984375,73.580078 v 98.724612 c 1.5610643,1.53068 3.101053,3.08786 4.7128906,4.55078 2.5783299,2.34012 5.2201629,4.59275 7.9179689,6.75 2.697805,2.15725 5.451429,4.21892 8.255859,6.18164 2.80443,1.96272 5.658438,3.82551 8.556641,5.58203 2.898203,1.75652 5.841187,3.40861 8.820312,4.94727 3.86494,1.99617 7.211397,3.9244 7.435547,4.28711 0.11208,0.18134 -0.243982,0.40563 -0.90625,0.62109 -0.662267,0.21546 -1.631157,0.4228 -2.748047,0.56836 -2.682456,0.34959 -5.278852,0.78063 -7.787109,1.29492 -2.508257,0.51429 -4.928606,1.11151 -7.263672,1.79102 -2.335065,0.6795 -4.583212,1.44187 -6.746094,2.28711 -2.162881,0.84523 -4.240716,1.77368 -6.232422,2.78515 -1.991705,1.01147 -3.897212,2.10694 -5.71875,3.28516 -1.8215372,1.17822 -3.5585596,2.43968 -5.210937,3.78515 -1.0838729,0.88257 -2.0744897,1.85779 -3.0859375,2.8125 v 24.44336 c 0,27.16356 21.8724735,49.03321 49.0410155,49.03321 H 246.15234 c 0.31634,-0.44682 0.68857,-0.88121 0.98633,-1.33008 1.03616,-1.56201 1.9563,-3.12998 2.73633,-4.66992 0.78003,-1.53994 1.421,-3.05122 1.89648,-4.4961 0.47549,-1.44487 0.7857,-2.82475 0.90821,-4.10156 0.12251,-1.27681 0.0562,-2.45059 -0.22266,-3.48633 -0.37389,-1.38853 -0.99839,-2.66982 -1.84961,-3.83789 -0.85121,-1.16807 -1.92756,-2.22235 -3.20312,-3.1582 -1.27557,-0.93585 -2.75149,-1.75344 -4.39844,-2.44531 -1.64695,-0.69188 -3.46628,-1.25917 -5.43164,-1.69532 -1.96536,-0.43614 -4.07584,-0.74149 -6.30664,-0.91015 -2.2308,-0.16866 -4.58212,-0.20042 -7.02539,-0.0899 -2.44328,0.11058 -4.97925,0.36406 -7.58203,0.76563 -2.60279,0.40157 -5.27115,0.95193 -7.98047,1.65625 -3.89336,1.01211 -12.997,3.98419 -20.22852,6.60547 -4.80061,1.7401 -8.35134,2.93306 -11.0625,3.68945 -2.71116,0.75639 -4.58157,1.07632 -6.01758,1.07617 -2.30155,-2.5e-4 -4.31364,-0.28414 -5.83398,-0.78515 -0.76017,-0.25051 -1.39799,-0.55564 -1.88672,-0.90625 -0.48873,-0.35061 -0.82955,-0.7457 -0.99609,-1.17969 -0.19063,-0.49677 -0.21014,-1.49884 -0.10157,-2.78906 0.10858,-1.29023 0.34592,-2.86976 0.66993,-4.52539 0.32401,-1.65564 0.73377,-3.38746 1.18945,-4.98047 0.45568,-1.59302 0.95735,-3.04609 1.46094,-4.14844 0.63534,-1.39079 1.30466,-2.66668 2.00976,-3.82813 0.7051,-1.16145 1.4449,-2.20997 2.22071,-3.14257 0.7758,-0.9326 1.58811,-1.75085 2.43554,-2.45508 0.84744,-0.70424 1.73038,-1.29318 2.65039,-1.76953 0.92001,-0.47636 1.87758,-0.83894 2.8711,-1.08789 0.99351,-0.24896 2.02383,-0.38421 3.09179,-0.40625 1.06797,-0.022 2.17307,0.0691 3.31641,0.27343 1.14334,0.20438 2.32526,0.52085 3.54492,0.95118 1.96895,0.69468 2.93968,1.04155 3.41797,1.08203 0.23914,0.0202 0.35386,-0.0368 0.41016,-0.16407 0.0563,-0.12725 0.0527,-0.32385 0.0527,-0.58789 0,-0.45988 -1.02128,-1.85917 -2.26953,-3.10742 -0.78648,-0.78647 -1.6807,-1.37378 -2.71289,-1.76172 -1.03219,-0.38793 -2.20189,-0.57552 -3.53516,-0.56445 -1.33327,0.0111 -2.83175,0.22228 -4.52148,0.63281 -1.68973,0.41053 -3.5703,1.01963 -5.67188,1.83008 -3.43144,1.32329 -6.39676,2.24776 -6.58984,2.05469 -0.19311,-0.19308 -0.56556,-3.13627 -0.82813,-6.54102 -0.20059,-2.60127 -0.20253,-4.81901 0.0117,-6.67773 0.21425,-1.85872 0.64462,-3.35773 1.30274,-4.52539 0.32906,-0.58384 0.71468,-1.08514 1.16015,-1.50586 0.44548,-0.42073 0.95012,-0.76134 1.51563,-1.02539 0.56551,-0.26406 1.19168,-0.45063 1.88086,-0.56446 0.68918,-0.11382 1.44134,-0.15497 2.25781,-0.125 l 3.63672,0.13282 -2.33008,-1.9043 c -0.79473,-0.64965 -1.52075,-1.1238 -2.2207,-1.41992 -0.69996,-0.29612 -1.37324,-0.41267 -2.05859,-0.34766 -0.68536,0.065 -1.38384,0.31234 -2.13477,0.7461 -0.75093,0.43375 -1.5545,1.05318 -2.45117,1.86328 -0.91205,0.82397 -1.71198,1.74532 -2.39844,2.76172 -0.68646,1.01639 -1.25949,2.12745 -1.71875,3.33203 -0.45926,1.20458 -0.80472,2.5021 -1.03516,3.89062 -0.23044,1.38852 -0.3457,2.86929 -0.3457,4.4375 0,1.7589 -0.14198,3.06816 -0.41406,3.92969 -0.13604,0.43076 -0.30504,0.74832 -0.50391,0.95508 -0.19886,0.20676 -0.42732,0.30217 -0.68554,0.28515 -0.51646,-0.034 -1.1497,-0.51561 -1.88282,-1.44336 -0.73312,-0.92775 -1.5662,-2.30144 -2.48828,-4.12109 -0.8188,-1.61582 -1.38015,-3.32541 -1.69922,-4.96484 -0.31907,-1.63944 -0.39707,-3.20907 -0.25195,-4.54493 0.14512,-1.33585 0.51412,-2.43747 1.08789,-3.14257 0.28689,-0.35255 0.62434,-0.60672 1.01172,-0.74024 0.38738,-0.13351 0.82516,-0.14595 1.30859,-0.0195 0.43837,0.11463 0.76629,0.19157 0.98438,0.18945 0.21809,-0.002 0.32608,-0.083 0.32226,-0.29101 -0.008,-0.41595 -0.46211,-1.33332 -1.36718,-3.10742 -0.67646,-1.32597 -1.16839,-2.62476 -1.47657,-3.88086 -0.30817,-1.25611 -0.43147,-2.46991 -0.37304,-3.62305 0.0584,-1.15314 0.29929,-2.2466 0.72265,-3.26367 0.42336,-1.01707 1.0298,-1.95679 1.81641,-2.80469 1.27683,-1.37631 4.59619,-6.32331 7.37695,-10.99219 1.67319,-2.8093 3.28471,-5.37908 4.90235,-7.79492 1.61763,-2.41584 3.24087,-4.67761 4.93359,-6.86914 1.69272,-2.19153 3.45504,-4.31284 5.35351,-6.44922 1.89848,-2.13638 3.9331,-4.28868 6.16797,-6.53906 4.13018,-4.15882 8.28627,-7.96623 12.7793,-11.62305 4.49303,-3.65682 9.32376,-7.16165 14.79883,-10.71875 5.47507,-3.55709 11.59558,-7.16574 18.67187,-11.02539 7.0763,-3.85965 15.10759,-7.97067 24.4043,-12.53515 17.40057,-8.54327 27.71237,-13.64464 34.74609,-17.26758 2.8261,-1.45567 4.04375,-2.26753 6.0586,-3.37305 V 94.369141 c -0.3644,0.176673 -0.59772,0.320097 -0.9668,0.498047 -7.86835,3.793682 -16.80682,7.880452 -27.02734,12.378902 -13.54228,5.96052 -25.66086,11.61661 -35.81836,16.69727 -5.07875,2.54033 -9.66686,4.937 -13.69727,7.15625 -4.0304,2.21925 -7.50427,4.26103 -10.35156,6.0918 -4.67707,3.00727 -9.26442,6.23785 -13.69141,9.62695 -4.42699,3.3891 -8.69193,6.93742 -12.72461,10.57812 -4.03267,3.64071 -7.83399,7.37463 -11.32812,11.13672 -3.49413,3.7621 -6.6828,7.55142 -9.49414,11.30469 -3.35854,4.48382 -6.43479,8.15234 -6.83789,8.15234 -0.40311,0 -1.83455,-1.51764 -3.17969,-3.37304 -0.57852,-0.798 -1.02023,-1.43498 -1.36328,-2.0625 -0.34305,-0.62752 -0.58697,-1.24679 -0.76563,-2.00586 -0.35731,-1.51814 -0.45773,-3.60059 -0.58398,-7.45703 l -0.26562,-8.15235 -3.08985,-3.08789 c -1.35446,-1.35445 -2.1055,-2.19047 -2.44141,-2.91601 -0.16795,-0.36278 -0.23275,-0.69832 -0.21679,-1.05664 0.016,-0.35833 0.11292,-0.73959 0.26562,-1.19532 0.29575,-0.88263 0.43362,-1.76393 0.41016,-2.65429 -0.0235,-0.89036 -0.20807,-1.79108 -0.56055,-2.71485 -0.35247,-0.92376 -0.87122,-1.87067 -1.5625,-2.85351 -0.69128,-0.98284 -1.55581,-2.00077 -2.5957,-3.06836 -1.70739,-1.75286 -2.66599,-2.82591 -3.1543,-3.73828 -0.24415,-0.45619 -0.3705,-0.87181 -0.41406,-1.3125 -0.0436,-0.4407 -0.004,-0.90598 0.084,-1.46094 0.12232,-0.77502 0.1181,-1.51338 -0.0137,-2.2207 -0.13177,-0.70733 -0.39155,-1.38464 -0.78515,-2.03711 -0.39361,-0.65247 -0.9208,-1.28017 -1.58399,-1.89063 -0.66319,-0.61045 -1.46182,-1.20387 -2.40234,-1.78515 -0.97732,-0.604 -1.66638,-1.16938 -2.11133,-1.75391 -0.44495,-0.58453 -0.64648,-1.18732 -0.64648,-1.86719 0,-1.05493 -0.66742,-3.20987 -1.48438,-4.78906 -1.87249,-3.61963 -3.27258,-6.59304 -4.19531,-8.9707 -0.92273,-2.37766 -1.36929,-4.16104 -1.33985,-5.39844 0.0147,-0.6187 0.14912,-1.10042 0.40235,-1.45313 0.25322,-0.3527 0.62516,-0.57635 1.11719,-0.67578 0.49202,-0.0994 1.1048,-0.0747 1.83593,0.0664 0.73113,0.14114 1.58025,0.40053 2.55078,0.76953 0.79619,0.30271 1.47596,0.47603 2.07032,0.5 0.59435,0.024 1.10312,-0.10155 1.56054,-0.39844 0.45742,-0.29688 0.86267,-0.76591 1.24805,-1.42578 0.38538,-0.65986 0.75262,-1.5112 1.13086,-2.57617 0.39467,-1.11122 0.94477,-2.22032 1.53516,-3.140626 0.59039,-0.920303 1.22059,-1.652047 1.76953,-2.011718 0.6931,-0.454142 1.48872,-0.738027 2.33203,-0.865235 0.8433,-0.127207 1.73303,-0.09688 2.61328,0.08008 0.88025,0.176956 1.75075,0.498683 2.55469,0.957032 0.80393,0.458348 1.54189,1.052561 2.15625,1.769531 1.41905,1.656066 2.87825,2.902686 4.23047,3.656246 0.6761,0.37678 1.32581,0.62979 1.92968,0.75 0.60388,0.12021 1.16358,0.10621 1.65821,-0.0508 0.38131,-0.12103 0.67415,-0.23812 0.89258,-0.40234 0.21842,-0.16422 0.36244,-0.37419 0.44531,-0.6836 0.16572,-0.61881 0.0876,-1.62989 -0.125,-3.441401 -0.69004,-5.878426 -1.06295,-9.691482 -1.13672,-12.035156 -0.0369,-1.171837 0.001,-1.976805 0.11133,-2.488282 0.11015,-0.511476 0.29242,-0.730468 0.54492,-0.730468 0.27772,0 1.24056,0.721819 2.56836,1.882812 1.3278,1.160993 3.02094,2.761937 4.75781,4.523438 2.67206,2.709954 4.42041,4.651713 5.9707,6.855468 1.5503,2.203756 2.90206,4.669669 4.77735,8.423829 1.21896,2.44026 2.32745,4.85993 3.13086,6.79492 0.8034,1.93498 1.30078,3.38528 1.30078,3.88086 0,0.49558 0.0785,0.94484 0.20508,1.27148 0.12655,0.32664 0.30212,0.5293 0.49414,0.5293 0.23261,0 0.44046,-0.4194 0.61132,-1.09961 0.17087,-0.68021 0.30347,-1.62029 0.38672,-2.6582 0.16651,-2.07582 0.13213,-4.54569 -0.20703,-6.11719 -0.21562,-0.99906 -0.28211,-1.64405 -0.1582,-2.08398 0.12391,-0.43994 0.43858,-0.67443 0.98437,-0.84766 0.30494,-0.0968 0.52275,-0.21166 0.63672,-0.41211 0.11398,-0.20045 0.12485,-0.4866 0.0137,-0.92578 -0.22235,-0.87836 -0.92976,-2.36814 -2.25782,-5.011718 -1.44184,-2.870083 -3.04122,-6.624334 -4.21484,-9.724609 -1.17362,-3.100276 -1.92183,-5.546911 -1.66406,-5.804688 0.13983,-0.139808 3.1305,-0.661257 6.64453,-1.158203 1.95058,-0.275849 3.76952,-0.427898 5.51562,-0.447266 1.74611,-0.01937 3.41781,0.09454 5.07617,0.34961 1.65836,0.255067 3.30289,0.651762 4.99024,1.199218 1.68735,0.547457 3.41887,1.245715 5.25195,2.103516 2.77282,1.29755 5.16733,2.359375 5.32227,2.359375 0.15502,0 -0.0788,-0.960425 -0.51953,-2.134765 -0.27491,-0.732473 -0.82242,-1.625564 -1.64063,-2.675782 -0.81821,-1.050217 -1.90699,-2.257989 -3.26367,-3.621094 -2.71335,-2.726209 -6.49773,-6.072867 -11.33594,-10.021484 -4.14434,-3.382347 -7.424,-6.269624 -9.67383,-8.498047 -1.12491,-1.114211 -1.99242,-2.063497 -2.58203,-2.828125 -0.5896,-0.764627 -0.90089,-1.344442 -0.91406,-1.71875 -0.0255,-0.724468 -0.2125,-1.660527 -0.51953,-2.710937 -0.30703,-1.050411 -0.7345,-2.215202 -1.24219,-3.402344 -1.01537,-2.374283 -2.3511,-4.833202 -3.68359,-6.619141 -1.28956,-1.728409 -2.20243,-3.12457 -2.69141,-4.273437 -0.24449,-0.574434 -0.38345,-1.087064 -0.41015,-1.548828 -0.0267,-0.461764 0.0589,-0.871616 0.26171,-1.242188 0.20283,-0.370572 0.52268,-0.701096 0.9668,-1.001953 0.44412,-0.300857 1.01182,-0.573552 1.70899,-0.826172 1.39432,-0.505239 3.30617,-0.933846 5.7832,-1.375 1.63637,-0.291425 2.86024,-0.623202 3.81445,-1.060547 0.95421,-0.437344 1.63905,-0.982105 2.20313,-1.699218 0.95353,-1.212153 1.44968,-2.125978 1.48242,-2.642579 0.0164,-0.2583 -0.0827,-0.415684 -0.29883,-0.46289 -0.21618,-0.04721 -0.5497,0.01639 -1,0.205078 -1.09276,0.457909 -3.30638,0.974442 -5.30469,1.318359 -1.99831,0.343918 -3.7815,0.515373 -4.01172,0.285157 -0.23209,-0.232086 1.00196,-1.967552 2.74219,-3.855469 1.72156,-1.86768 3.32356,-4.097456 4.48633,-6.136719 0.58139,-1.019631 1.05195,-1.991195 1.375,-2.845703 0.32305,-0.854508 0.4968,-1.591874 0.48242,-2.142578 -0.005,-0.191404 -0.0618,-0.272103 -0.16211,-0.253906 -0.10033,0.0182 -0.24323,0.134464 -0.41797,0.33789 -0.34948,0.406853 -0.82612,1.160558 -1.34765,2.16211 -0.5841,1.121697 -1.15916,2.062468 -1.75,2.841797 -0.59085,0.779328 -1.1975,1.396744 -1.85157,1.875 -0.65406,0.478255 -1.35513,0.816676 -2.1289,1.035156 C 172.5563,22.902073 171.70972,23 170.75977,23 c -1.61313,0 -2.9336,-0.140748 -2.9336,-0.314453 0,-0.173711 1.04888,-2.655741 2.33203,-5.515625 0.82068,-1.829122 1.4558,-3.38265 1.91211,-4.736328 0.45632,-1.353679 0.73392,-2.5088158 0.8418,-3.5390628 0.10787,-1.0302469 0.0469,-1.9360941 -0.17773,-2.7949218 -0.22465,-0.8588277 -0.61305,-1.6703449 -1.1543,-2.5097656 l -0.30274,-0.4707032 h -1.68359 l -0.3125,2.9863282 c -0.23757,2.2677001 -0.61664,4.4094282 -1.09961,6.3457032 -0.48297,1.936275 -1.07139,3.667384 -1.72852,5.115234 -0.65712,1.44785 -1.38256,2.613591 -2.14257,3.416016 -0.38001,0.401212 -0.76779,0.711456 -1.16016,0.921875 -0.39237,0.210419 -0.78972,0.320312 -1.18555,0.320312 -0.31404,0 -0.75124,-0.178654 -1.20312,-0.464843 -0.45188,-0.286189 -0.91749,-0.679064 -1.28906,-1.113282 -0.54497,-0.636858 -0.8839,-1.415246 -1.08789,-2.833984 -0.204,-1.418738 -0.27285,-3.478391 -0.2793,-6.677734 -0.004,-2.1077884 -0.0595,-3.8547943 -0.19141,-5.3359379 -0.0944,-1.0595331 -0.28704,-1.8554277 -0.47265,-2.6796875 z m -6.9707,235.4199194 2.66016,1.55469 c 1.03432,0.60408 1.9375,1.28146 2.70898,2.03516 0.77148,0.7537 1.41235,1.58382 1.92383,2.49218 0.51148,0.90837 0.89412,1.89482 1.14844,2.96289 0.25431,1.06808 0.38086,2.21639 0.38086,3.44922 0,1.64357 -0.0816,2.98184 -0.33203,4.125 -0.25046,1.14316 -0.671,2.09269 -1.34766,2.96094 -0.67666,0.86825 -1.61008,1.65383 -2.88867,2.47266 -1.2786,0.81882 -2.90271,1.66916 -4.95899,2.66406 -1.97098,0.95364 -4.54768,2.04849 -7.11328,3.04297 -2.56559,0.99448 -5.11936,1.89009 -7.04101,2.44531 -1.81794,0.52527 -3.86943,0.98577 -5.9668,1.36524 -2.09737,0.37946 -4.24056,0.67664 -6.23828,0.87304 -1.99772,0.1964 -3.85016,0.29347 -5.36914,0.26953 -1.51899,-0.0239 -2.70406,-0.16768 -3.36524,-0.44922 -0.33593,-0.14305 -0.56234,-0.2841 -0.64258,-0.46484 -0.0802,-0.18074 -0.0144,-0.40218 0.23047,-0.70703 0.48976,-0.60971 1.69952,-1.55307 3.90625,-3.17774 2.76285,-2.03406 7.30323,-5.05332 10.08985,-6.70898 2.78662,-1.65565 7.13804,-4.67903 9.66992,-6.71875 2.08572,-1.68029 3.56082,-3.00551 5.14453,-4.78125 1.58372,-1.77574 3.2747,-4.00242 5.79297,-7.48437 z"
-         id="rect3179"
-         transform="matrix(1.0090505,0,0,1.0106742,-1.2782867,-1.9225941)" />
-    </g>
-    <path
-       inkscape:connector-curvature="0"
-       style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#552200;stroke-width:0.980724;stroke-opacity:0"
-       d="m 132.41857,3.1290105 c 1.79445,2.64993 2.85399,5.93302 2.86914,9.2578095 0.0308,6.76372 -2.99332,8.90817 -6.20313,4.40039 -1.79855,-2.52581 -5.25079,-4.64648 -7.56445,-4.64648 -1.68137,0 -8.73047,4.29731 -8.73047,5.32226 0,0.38399 1.60648,0.5165 3.57227,0.29492 3.76205,-0.42403 4.93108,0.32845 4.95508,3.18555 0.0216,2.59665 -4.80076,8.18697 -12.76758,14.79883 -10.257708,8.51311 -13.619104,12.25528 -13.619104,15.16602 0,1.66789 -0.75061,2.88943 -2.83008,4.60351 l -2.83008,2.33399 1.27735,2.6914 c 1.74277,3.67261 1.63237,4.51601 -1.02149,7.85547 -3.11602,3.921 -3.46306,5.418 -1.83398,7.9043 1.62087,2.47375 1.70168,8.52108 0.21679,16.39062 -1.28155,6.79198 -0.53224,16.8316 1.86915,25.04688 1.061,3.62976 4.36747,13.06282 7.3496,20.96289 6.349874,16.82185 7.593314,20.92077 8.665984,28.5918 1.53568,10.98235 -1.15485,19.85496 -7.976524,26.30664 -4.72719,4.47078 -7.7283,5.48079 -11.54102,3.88476 -7.71362,-3.22896 -12.7202,-13.52653 -21.70312,-44.62695 C 55.449436,121.26658 47.656676,108.23511 30.080716,95.16807 22.976948,89.88669 12.787515,81.72847 2.9869649,73.63096 v 98.76953 c 11.5402171,11.30876 24.4995201,20.81688 38.2636711,27.92579 3.86494,1.99617 7.2114,3.9244 7.43555,4.28711 0.22416,0.36268 -1.42052,0.89834 -3.6543,1.18945 -17.828657,2.32353 -31.785751,8.2921 -42.0449211,17.95508 v 24.52929 c 0,27.16356 21.8724741,49.03321 49.0410211,49.03321 H 246.29357 c 4.71476,-6.66289 7.44701,-13.64585 6.25195,-18.08399 -2.99115,-11.10825 -22.10279,-15.34941 -43.77734,-9.71484 -3.89336,1.01211 -12.997,3.98419 -20.22852,6.60547 -9.60122,3.4802 -14.20807,4.76592 -17.08008,4.76562 -4.60311,-5e-4 -8.05063,-1.13512 -8.71679,-2.87109 -0.76252,-1.98709 1.20442,-12.03396 3.21875,-16.44336 5.08271,-11.12628 12.38334,-14.90741 22.14062,-11.46484 3.93789,1.38937 3.88086,1.38623 3.88086,0.33007 0,-0.45988 -1.02128,-1.85917 -2.26953,-3.10742 -3.14593,-3.1459 -8.03512,-3.10508 -16.44141,0.13672 -3.43144,1.32329 -6.39676,2.24776 -6.58984,2.05469 -0.19311,-0.19308 -0.56556,-3.13627 -0.82813,-6.54102 -0.80236,-10.4051 1.59711,-14.6636 8.12891,-14.42383 l 3.63672,0.13282 -2.33008,-1.9043 c -3.17891,-2.5986 -5.27854,-2.39857 -8.86523,0.8418 -3.64818,3.2959 -5.49805,8.14902 -5.49805,14.42187 0,7.0356 -2.28628,6.88407 -5.97461,-0.39453 -3.27522,-6.46329 -2.41046,-14.42347 1.45703,-13.41211 1.75346,0.45853 1.74961,0.33923 -0.0605,-3.20898 -2.70582,-5.30388 -2.457,-10.18068 0.68945,-13.57227 1.27683,-1.37631 4.59619,-6.32331 7.37695,-10.99219 6.69277,-11.23721 12.41794,-18.65081 21.35742,-27.65234 16.5207,-16.63529 33.46746,-27.64442 70.6543,-45.90234 23.2632,-11.42169 33.77603,-16.6595 40.80469,-20.46875 V 94.4044 c -8.10769,3.9288 -17.34056,8.1625 -27.99414,12.85156 -27.08456,11.92104 -48.47801,22.62224 -59.86719,29.94532 -18.70827,12.0291 -35.99291,27.63339 -47.23828,42.64648 -3.35854,4.48382 -6.43479,8.15234 -6.83789,8.15234 -0.40311,0 -1.83455,-1.51764 -3.17969,-3.37304 -2.3141,-3.19197 -2.46039,-3.81251 -2.71289,-11.52539 l -0.26562,-8.15235 -3.08985,-3.08789 c -2.70892,-2.70891 -3.00339,-3.34507 -2.39258,-5.16797 1.183,-3.53052 -0.14904,-7.02063 -4.30859,-11.29101 -3.41478,-3.50572 -3.8347,-4.29188 -3.48438,-6.51172 0.48928,-3.10009 -1.02306,-5.60847 -4.78515,-7.93359 -1.95464,-1.20799 -2.75781,-2.26136 -2.75781,-3.6211 0,-1.05493 -0.66742,-3.20987 -1.48438,-4.78906 -7.48995,-14.47851 -7.39319,-18.61409 0.37109,-15.66211 3.18476,1.21085 4.4968,0.35947 6.00977,-3.90039 0.78935,-2.22243 2.20682,-4.433 3.30469,-5.15235 2.7724,-1.81656 7.19881,-0.92647 9.65625,1.94141 2.8381,3.31214 5.83985,4.98342 7.81836,4.35547 1.52524,-0.48411 1.63818,-0.90431 1.21289,-4.52735 -1.38008,-11.75685 -1.49048,-15.2539 -0.48047,-15.2539 0.55545,0 3.85243,2.88325 7.32617,6.40625 5.34412,5.41991 6.99747,7.77098 10.74805,15.2793 2.43792,4.88051 4.43164,9.68461 4.43164,10.67578 0,0.99116 0.31519,1.80078 0.69922,1.80078 0.93045,0 1.46933,-6.732 0.79101,-9.875 -0.43125,-1.99812 -0.26542,-2.58519 0.82617,-2.93164 1.21975,-0.38713 1.04869,-1.06245 -1.60742,-6.34961 -2.88369,-5.74017 -6.39443,-15.01375 -5.8789,-15.5293 0.13983,-0.13981 3.1305,-0.66126 6.64453,-1.1582 7.80234,-1.1034 13.50167,-0.22613 20.83398,3.20508 2.77282,1.29755 5.16733,2.35937 5.32227,2.35937 0.15502,0 -0.0788,-0.96042 -0.51953,-2.13476 -1.09964,-2.9299 -6.56383,-8.42113 -16.24024,-16.31836 -8.28869,-6.7647 -13.11722,-11.5477 -13.16992,-13.04493 -0.10184,-2.89787 -2.78033,-9.16054 -5.44531,-12.73242 -5.15825,-6.91364 -4.28899,-8.50296 5.61914,-10.26758 3.27274,-0.58285 4.88942,-1.32554 6.01758,-2.75976 1.90706,-2.42431 1.98481,-3.65516 0.18359,-2.90039 -2.18552,0.91581 -8.85598,2.06395 -9.31641,1.60351 -0.23209,-0.23208 1.00196,-1.96755 2.74219,-3.85547 3.44312,-3.73536 6.40125,-8.92218 6.34375,-11.125 -0.0199,-0.76561 -0.88467,0.243 -1.92773,2.2461 -2.33641,4.48679 -4.501,6.06836 -8.30082,6.06836 -1.61313,0 -2.9336,-0.14075 -2.9336,-0.31446 0,-0.17371 1.04888,-2.65574 2.33203,-5.51562 3.2827,-7.3164891 3.58687,-10.2223995 1.42188,-13.5800795 l -0.30274,-0.4707 h -1.68359 l -0.3125,2.98633 c -0.95027,9.0707995 -4.14979,16.1191395 -7.31641,16.1191395 -0.62809,0 -1.74903,-0.70969 -2.49218,-1.57813 -1.08993,-1.27372 -1.35429,-3.11303 -1.36719,-9.51172 -0.007,-3.5429495 -0.15737,-6.0560195 -0.58203,-8.0156195 h -3.95117 c 0.48387,5.76907 -0.91608,10.4306095 -4.125,13.4570295 -1.48264,1.39829 -2.93278,2.54041 -3.22266,2.53711 -0.28986,-0.003 -0.56749,-2.24332 -0.61719,-4.97656 -0.086,-4.7244095 -1.1546,-8.3916395 -3.17187,-11.0175795 z m 14.25195,235.4199195 2.66016,1.55469 c 4.13728,2.41631 6.16211,6.00811 6.16211,10.93945 0,6.57427 -1.30225,8.24305 -9.52735,12.22266 -3.94197,1.90728 -10.31099,4.37783 -14.15429,5.48828 -7.27175,2.10107 -18.29477,3.18474 -20.93946,2.05859 -1.34373,-0.5722 -0.91933,-1.10028 3.49414,-4.34961 2.76285,-2.03406 7.30323,-5.05332 10.08985,-6.70898 2.78662,-1.65565 7.13804,-4.67903 9.66992,-6.71875 4.17145,-3.36059 5.90097,-5.30172 10.9375,-12.26562 z m -1.4043,32.11133 c 2.38427,-0.0113 3.72654,1.53089 6.27344,4.97852 1.72825,2.33945 3.49906,4.47436 3.93555,4.74414 1.4273,0.8821 0.83278,1.95312 -1.08399,1.95312 -1.03214,0 -5.55339,1.786 -10.04687,3.97071 -8.77919,4.26841 -13.8618,5.37805 -16.41602,3.58398 -0.85406,-0.59987 -3.56018,-1.90958 -6.01562,-2.91211 -2.45544,-1.00255 -4.46484,-2.04396 -4.46484,-2.3125 0,-1.01534 4.40433,-4.556 7.76367,-6.24219 1.92165,-0.96454 7.11558,-3.25092 11.54101,-5.08008 4.17502,-1.72567 6.65924,-2.67478 8.51367,-2.68359 z"
-       id="rect3179-7" />
-  </g>
-</svg>
diff --git a/doc/doxygen/images/screenshots/deck_dock_deck_list.png b/doc/doxygen/images/deck_dock_deck_list.png
similarity index 100%
rename from doc/doxygen/images/screenshots/deck_dock_deck_list.png
rename to doc/doxygen/images/deck_dock_deck_list.png
diff --git a/doc/doxygen/images/screenshots/deck_dock_deck_list_buttons.png b/doc/doxygen/images/deck_dock_deck_list_buttons.png
similarity index 100%
rename from doc/doxygen/images/screenshots/deck_dock_deck_list_buttons.png
rename to doc/doxygen/images/deck_dock_deck_list_buttons.png
diff --git a/doc/doxygen/images/screenshots/deck_dock_deck_list_group_by.png b/doc/doxygen/images/deck_dock_deck_list_group_by.png
similarity index 100%
rename from doc/doxygen/images/screenshots/deck_dock_deck_list_group_by.png
rename to doc/doxygen/images/deck_dock_deck_list_group_by.png
diff --git a/doc/doxygen/images/screenshots/deckeditordeckdockwidget.png b/doc/doxygen/images/deckeditordeckdockwidget.png
similarity index 100%
rename from doc/doxygen/images/screenshots/deckeditordeckdockwidget.png
rename to doc/doxygen/images/deckeditordeckdockwidget.png
diff --git a/doc/doxygen/images/screenshots/printing_selector.png b/doc/doxygen/images/printing_selector.png
similarity index 100%
rename from doc/doxygen/images/screenshots/printing_selector.png
rename to doc/doxygen/images/printing_selector.png
diff --git a/doc/doxygen/images/screenshots/printing_selector_disable.png b/doc/doxygen/images/printing_selector_disable.png
similarity index 100%
rename from doc/doxygen/images/screenshots/printing_selector_disable.png
rename to doc/doxygen/images/printing_selector_disable.png
diff --git a/doc/doxygen/images/screenshots/printing_selector_enable.png b/doc/doxygen/images/printing_selector_enable.png
similarity index 100%
rename from doc/doxygen/images/screenshots/printing_selector_enable.png
rename to doc/doxygen/images/printing_selector_enable.png
diff --git a/doc/doxygen/images/screenshots/printing_selector_navigation.png b/doc/doxygen/images/printing_selector_navigation.png
similarity index 100%
rename from doc/doxygen/images/screenshots/printing_selector_navigation.png
rename to doc/doxygen/images/printing_selector_navigation.png
diff --git a/doc/doxygen/images/screenshots/printing_selector_options.png b/doc/doxygen/images/printing_selector_options.png
similarity index 100%
rename from doc/doxygen/images/screenshots/printing_selector_options.png
rename to doc/doxygen/images/printing_selector_options.png
diff --git a/doc/doxygen/images/screenshots/printing_selector_pre_providerid.png b/doc/doxygen/images/printing_selector_pre_providerid.png
similarity index 100%
rename from doc/doxygen/images/screenshots/printing_selector_pre_providerid.png
rename to doc/doxygen/images/printing_selector_pre_providerid.png
diff --git a/doc/doxygen/images/screenshots/release_channel_beta.png b/doc/doxygen/images/release_channel_beta.png
similarity index 100%
rename from doc/doxygen/images/screenshots/release_channel_beta.png
rename to doc/doxygen/images/release_channel_beta.png
diff --git a/doc/doxygen/images/screenshots/vde_deck_analytics.png b/doc/doxygen/images/vde_deck_analytics.png
similarity index 100%
rename from doc/doxygen/images/screenshots/vde_deck_analytics.png
rename to doc/doxygen/images/vde_deck_analytics.png
diff --git a/doc/doxygen/images/screenshots/vde_flat_layout_color_grouped.png b/doc/doxygen/images/vde_flat_layout_color_grouped.png
similarity index 100%
rename from doc/doxygen/images/screenshots/vde_flat_layout_color_grouped.png
rename to doc/doxygen/images/vde_flat_layout_color_grouped.png
diff --git a/doc/doxygen/images/screenshots/vde_flat_layout_type_grouped.png b/doc/doxygen/images/vde_flat_layout_type_grouped.png
similarity index 100%
rename from doc/doxygen/images/screenshots/vde_flat_layout_type_grouped.png
rename to doc/doxygen/images/vde_flat_layout_type_grouped.png
diff --git a/doc/doxygen/images/screenshots/vde_overlap_layout_type_grouped.png b/doc/doxygen/images/vde_overlap_layout_type_grouped.png
similarity index 100%
rename from doc/doxygen/images/screenshots/vde_overlap_layout_type_grouped.png
rename to doc/doxygen/images/vde_overlap_layout_type_grouped.png
diff --git a/doc/doxygen/images/screenshots/vde_sample_hand.png b/doc/doxygen/images/vde_sample_hand.png
similarity index 100%
rename from doc/doxygen/images/screenshots/vde_sample_hand.png
rename to doc/doxygen/images/vde_sample_hand.png
diff --git a/gcovr.cfg b/gcovr.cfg
deleted file mode 100644
index ac893b6a4..000000000
--- a/gcovr.cfg
+++ /dev/null
@@ -1,63 +0,0 @@
-# gcovr configuration for Cockatrice line coverage.
-#
-# Used by .ci/compile.sh --coverage and by hand:
-#
-#   cmake -S . -B build/cover -DCMAKE_BUILD_TYPE=Debug -DWITH_SERVER=1 -DTEST=1 -DENABLE_COVERAGE=ON
-#   cmake --build build/cover -j 24
-#   ctest --test-dir build/cover -LE bench -j 24
-#   gcovr build/cover --root . --object-directory build/cover --txt --decisions
-#
-# The point of most of this file is subtraction. A raw report is dominated by code no test can
-# reach: vendored third-party trees, build directories left over from earlier experiments, and
-# the client's main() and window classes, which have no headless test. Those all dilute the one
-# number worth watching, so they are filtered out here rather than in every invocation.
-
-# root is deliberately not set here. This file is normally invoked from the build directory
-# (compile.sh runs there, because it configures with `cmake ..`), so a `root` of `.` would
-# resolve to the build tree and every filter below would exclude everything. compile.sh passes
-# --root explicitly instead.
-
-# Our own code only. This keeps generated Qt MOC output, protobuf output and anything CMake
-# built under the source tree out of the report.
-filter = ^cockatrice/
-filter = ^libcockatrice_[^/]+/
-filter = ^servatrice/
-filter = ^oracle/
-
-# The tests are the vehicle, not the subject. They are compiled with the same instrumentation,
-# so leaving them in would add their near-perfect coverage to the numerator and quietly report a
-# healthier project than we have: test code is only ever executed by the run that is measuring
-# it. Helpers under tests/ are excluded on the same grounds.
-exclude = ^tests/
-
-# Vendored third-party code is not ours to cover and is never going to move the number.
-exclude = ^vcpkg/
-exclude = ^doc/doxygen/theme/
-exclude = ^libcockatrice_rng/libcockatrice/rng/sfmt/
-exclude = ^libcockatrice_utility/libcockatrice/utility/peglib\.h$
-exclude = ^oracle/src/lzma/
-exclude = ^oracle/src/qt-json/
-exclude = ^oracle/src/zip/
-exclude = ^servatrice/src/smtp/
-
-# Qt's own moc/pch/uic output is generated into the build tree, not the source tree, so the
-# filters above already keep it out. These cover CLion's directories, which sit in-tree and are
-# picked up by the object-directory walk.
-exclude = .*cmake-build-.*
-exclude = .*\.cache/
-
-# Process entry points and the client's window chrome. Each of these needs a display, an
-# interactive terminal, or a live database before it does anything a test could observe, so no
-# headless run will ever move them. Left in, they contribute thousands of lines at 0% and drag
-# the total down by a fixed amount that hides movement in the code we can actually test. The
-# window header is excluded with its .cpp because gcovr attributes its inline template code
-# there, which is where most of its line count lives.
-exclude = ^cockatrice/src/main\.cpp$
-exclude = ^cockatrice/src/interface/window_main\.
-exclude = ^oracle/src/main\.cpp$
-exclude = ^servatrice/src/main\.cpp$
-
-exclude-throw-branches = yes
-exclude-function-lines = yes
-
-print-summary = yes
diff --git a/iwyu.sh b/iwyu.sh
deleted file mode 100755
index 279200adf..000000000
--- a/iwyu.sh
+++ /dev/null
@@ -1,226 +0,0 @@
-#!/bin/bash
-
-# This script runs include-what-you-use on the given source files or
-# directories, applies its suggestions (forward declarations, minimal and
-# canonical #includes), then reformats the touched files with clang-format.
-#
-# Uses include-what-you-use, iwyu_tool.py, fix_includes.py, clang-format and
-# python3. Requires a build directory configured with
-# -DCMAKE_EXPORT_COMPILE_COMMANDS=ON to provide compile_commands.json.
-#
-# The Qt 6 mapping (qt6.imp) makes IWYU prefer capital includes like
-# #include <QWidget> over #include <qwidget.h> and keeps forward declarations
-# where possible. Regenerate it with tools/generate_qt_mappings.py whenever the
-# installed Qt version changes.
-#
-# Usage:
-#   ./iwyu.sh [-b <build-dir>] [-m <mapping>] [-j <jobs>] [-n] <files|dirs...>
-#
-# Options:
-#   -b, --build-dir DIR   build dir with compile_commands.json (default: build)
-#   -m, --mapping FILE    IWYU mapping file (default: qt6.imp)
-#   -j, --jobs N          IWYU parallel jobs (default: 2)
-#   -n, --dry-run         only print IWYU output, do not modify any file
-
-set -o pipefail
-
-# go to the project root directory, this file should be located in the project root directory
-cd "${BASH_SOURCE%/*}/" || exit 2 # could not find path, this could happen with special links etc.
-
-# defaults
-build_dir="build"
-mapping="qt6.imp"
-jobs=2
-dry_run=0
-
-# 3rd party code that must not be touched by IWYU or clang-format
-excludes=("libcockatrice_rng/libcockatrice/rng/sfmt/" \
-"libcockatrice_utility/libcockatrice/utility/peglib.h" \
-"oracle/src/lzma/" \
-"oracle/src/qt-json/" \
-"oracle/src/zip/" \
-"servatrice/src/smtp/")
-
-usage() {
-  cat <<EOM
-Usage: $0 [-b <build-dir>] [-m <mapping>] [-j <jobs>] [-n] <files|dirs...>
-
-Runs include-what-you-use on the given files/directories, applies the
-suggested include changes in place, and reformats touched files.
-
-Options:
-  -b, --build-dir DIR   build dir with compile_commands.json (default: build)
-  -m, --mapping FILE    IWYU mapping file (default: qt6.imp)
-  -j, --jobs N          IWYU parallel jobs (default: 2)
-  -n, --dry-run         only print IWYU output, do not modify any file
-  -h, --help            show this help
-EOM
-}
-
-# parse options
-while [[ $* ]]; do
-  case "$1" in
-    '-b'|'--build-dir')
-      build_dir=$2
-      shift 2
-      ;;
-    '-m'|'--mapping')
-      mapping=$2
-      shift 2
-      ;;
-    '-j'|'--jobs')
-      jobs=$2
-      shift 2
-      ;;
-    '-n'|'--dry-run')
-      dry_run=1
-      shift
-      ;;
-    '-h'|'--help')
-      usage
-      exit 0
-      ;;
-    *)
-      targets+=("$1")
-      shift
-      ;;
-  esac
-done
-
-# find the IWYU tools, preferring PATH and falling back to the LLVM dir
-find_tool() {
-  local tool=$1
-  local path
-  if path=$(command -v "$tool" 2>/dev/null); then
-    echo "$path"
-  elif [ -x "/usr/lib/llvm/22/bin/$tool" ]; then
-    echo "/usr/lib/llvm/22/bin/$tool"
-  else
-    return 1
-  fi
-}
-
-find_tool include-what-you-use > /dev/null || { echo "error: include-what-you-use not found"; exit 1; }
-IWYU_TOOL=$(find_tool iwyu_tool.py) || { echo "error: iwyu_tool.py not found"; exit 1; }
-FIX_INCLUDES=$(find_tool fix_includes.py) || { echo "error: fix_includes.py not found"; exit 1; }
-command -v clang-format >/dev/null 2>&1 || { echo "error: clang-format not found"; exit 1; }
-
-if [ "${#targets[@]}" -eq 0 ]; then
-  echo "error: specify at least one source file or directory" >&2
-  usage
-  exit 1
-fi
-
-if [ ! -f "$mapping" ]; then
-  echo "error: mapping file '$mapping' not found" >&2
-  exit 1
-fi
-
-if [ ! -f "$build_dir/compile_commands.json" ]; then
-  echo "error: '$build_dir/compile_commands.json' not found" >&2
-  echo "configure the build with -DCMAKE_EXPORT_COMPILE_COMMANDS=ON first" >&2
-  exit 1
-fi
-
-tmpdir=$(mktemp -d /tmp/iwyu.XXXXXX)
-trap 'rm -rf "$tmpdir"' EXIT
-
-# filter the compilation database: drop excluded 3rd party code and strip the
-# GCC-only flags that clang/include-what-you-use rejects
-root="$PWD"
-python3 - "$build_dir/compile_commands.json" "$root" "${excludes[@]}" <<'PYEOF' > "$tmpdir/compile_commands.json"
-import json
-import os
-import re
-import sys
-
-cc_path, root = sys.argv[1], sys.argv[2]
-excludes = sys.argv[3:]
-root = os.path.normpath(root)
-excl_norm = [os.path.normpath(os.path.join(root, e)) for e in excludes]
-
-out = []
-for entry in json.load(open(cc_path)):
-    path = os.path.normpath(entry['file'])
-    if not path.startswith(root + os.sep):
-        continue
-    # skip generated code: protobuf output and moc autogen files
-    if re.search(r'\.pb\.(h|cc)$', path) or '_autogen/' in path:
-        continue
-    if any(path.startswith(e + os.sep) or path == e for e in excl_norm):
-        continue
-    command = entry.get('command', '')
-    command = re.sub(r'-mno-direct-extern-access', '', command)
-    command = re.sub(r'--coverage', '', command)
-    out.append(dict(entry, command=command))
-
-json.dump(out, sys.stdout)
-PYEOF
-
-mapping_abs="$PWD/$mapping"
-if [ "$dry_run" = 1 ]; then
-  python3 "$IWYU_TOOL" -p "$tmpdir" -o iwyu -j "$jobs" "${targets[@]}" \
-    -- -Xiwyu "--mapping_file=$mapping_abs"
-else
-  before=$(git diff --name-only 2>/dev/null | sort -u)
-
-  python3 "$IWYU_TOOL" -p "$tmpdir" -o iwyu -j "$jobs" "${targets[@]}" \
-    -- -Xiwyu "--mapping_file=$mapping_abs" |
-    python3 "$FIX_INCLUDES" --nosafe_headers --nocomments --noreorder --basedir="$root"
-
-  # fix_includes can emit absolute paths for headers that the compiler resolved
-  # through an absolute -I entry. Those are machine-specific and break every
-  # other checkout and CI, so rewrite them into the project-relative quoted
-  # form the codebase uses. Must run before clang-format so the regroup/sort
-  # pass sees the final paths.
-  python3 - "$root" <<'PYEOF'
-import os
-import re
-import subprocess
-import sys
-
-root = os.path.normpath(sys.argv[1])
-pattern = re.compile(r'^(\s*#\s*include\s*)"(/)')
-
-# Collect from git so untracked scratch files are left alone.
-changed = subprocess.run(
-    ['git', 'diff', '--name-only', '--diff-filter=ACMR'],
-    capture_output=True, text=True, check=True).stdout.split()
-
-for rel in changed:
-    if not rel.endswith(('.h', '.cpp', '.cc', '.cxx')):
-        continue
-    path = os.path.join(root, rel)
-    if not os.path.isfile(path):
-        continue
-    src = open(path, encoding='utf-8').read()
-    if '"' + os.sep not in src:
-        continue
-    out = []
-    for line in src.split('\n'):
-        m = pattern.match(line)
-        if not m:
-            out.append(line)
-            continue
-        target = os.path.normpath(line[m.end(1) + 1:].rstrip('"'))
-        if not target.startswith(root + os.sep):
-            out.append(line)
-            continue
-        spelled = os.path.relpath(target, os.path.dirname(path))
-        out.append(f'{m.group(1)}"{spelled}"')
-    new = '\n'.join(out)
-    if new != src:
-        open(path, 'w', encoding='utf-8').write(new)
-PYEOF
-
-  # reformat every file this IWYU pass modified (fix_includes also touches
-  # headers pulled in by the requested files)
-  touched=$(comm -13 <(printf '%s\n' "$before") <(git diff --name-only 2>/dev/null | sort -u))
-  for file in $touched; do
-    case "$file" in
-      *.h|*.cpp)
-        clang-format -i "$file"
-        ;;
-    esac
-  done
-fi
diff --git a/libcockatrice_card/CMakeLists.txt b/libcockatrice_card/CMakeLists.txt
index b3583522c..15388ecfc 100644
--- a/libcockatrice_card/CMakeLists.txt
+++ b/libcockatrice_card/CMakeLists.txt
@@ -60,5 +60,3 @@ target_link_libraries(
   PUBLIC libcockatrice_utility
   PUBLIC ${QT_CORE_MODULE}
 )
-
-target_precompile_headers(libcockatrice_card PRIVATE "${CMAKE_SOURCE_DIR}/cmake/pch/qtcore_pch.h")
diff --git a/libcockatrice_card/libcockatrice/card/card_info.cpp b/libcockatrice_card/libcockatrice/card/card_info.cpp
index bd33f18e7..56c737793 100644
--- a/libcockatrice_card/libcockatrice/card/card_info.cpp
+++ b/libcockatrice_card/libcockatrice/card/card_info.cpp
@@ -1,17 +1,21 @@
 #include "card_info.h"
 
 #include "game_specific_terms.h"
-#include "libcockatrice/card/lazy_properties_hash.h"
 #include "printing/printing_info.h"
 #include "relation/card_relation.h"
 #include "set/card_set.h"
 
-#include <QHashIterator>
+#include <QDir>
 #include <QRegularExpression>
 #include <QSharedPointer>
 #include <QString>
+#include <algorithm>
 #include <utility>
 
+class CardRelation;
+class CardSet;
+class CardInfo;
+
 using CardInfoPtr = QSharedPointer<CardInfo>;
 
 const QHash<QString, QString> &CardInfo::getPropertiesHash() const
diff --git a/libcockatrice_card/libcockatrice/card/card_info.h b/libcockatrice_card/libcockatrice/card/card_info.h
index 356da0546..17894cec5 100644
--- a/libcockatrice_card/libcockatrice/card/card_info.h
+++ b/libcockatrice_card/libcockatrice/card/card_info.h
@@ -5,19 +5,15 @@
 #include "lazy_properties_hash.h"
 #include "printing/printing_info.h"
 
-#include <QByteArray>
-#include <QChar>
+#include <QDate>
 #include <QHash>
 #include <QList>
 #include <QLoggingCategory>
 #include <QMap>
 #include <QMetaType>
-#include <QObject>
-#include <QSet>
+#include <QMutex>
 #include <QSharedPointer>
-#include <QString>
-#include <QStringList>
-#include <qtmetamacros.h>
+#include <QVariant>
 #include <utility>
 
 inline Q_LOGGING_CATEGORY(CardInfoLog, "card_info");
@@ -25,6 +21,7 @@ inline Q_LOGGING_CATEGORY(CardInfoLog, "card_info");
 class CardInfo;
 class CardSet;
 class CardRelation;
+class ICardDatabaseParser;
 
 typedef QSharedPointer<CardInfo> CardInfoPtr;
 typedef QSharedPointer<CardSet> CardSetPtr;
diff --git a/libcockatrice_card/libcockatrice/card/card_info_comparator.cpp b/libcockatrice_card/libcockatrice/card/card_info_comparator.cpp
index d0800e596..cc0314e21 100644
--- a/libcockatrice_card/libcockatrice/card/card_info_comparator.cpp
+++ b/libcockatrice_card/libcockatrice/card/card_info_comparator.cpp
@@ -1,11 +1,5 @@
 #include "card_info_comparator.h"
 
-#include "libcockatrice/card/card_info.h"
-
-#include <QMetaType>
-#include <QSharedPointer>
-#include <compare>
-
 CardInfoComparator::CardInfoComparator(const QStringList &properties, Qt::SortOrder order)
     : m_properties(properties), m_order(order)
 {
diff --git a/libcockatrice_card/libcockatrice/card/card_info_comparator.h b/libcockatrice_card/libcockatrice/card/card_info_comparator.h
index b184f5d55..b6df8c7a3 100644
--- a/libcockatrice_card/libcockatrice/card/card_info_comparator.h
+++ b/libcockatrice_card/libcockatrice/card/card_info_comparator.h
@@ -9,9 +9,6 @@
 
 #include "card_info.h"
 
-#include <QList>
-#include <QString>
-#include <QStringList>
 #include <QVariant>
 #include <Qt>
 
diff --git a/libcockatrice_card/libcockatrice/card/card_localization.cpp b/libcockatrice_card/libcockatrice/card/card_localization.cpp
index 4f91bac78..03c6c659b 100644
--- a/libcockatrice_card/libcockatrice/card/card_localization.cpp
+++ b/libcockatrice_card/libcockatrice/card/card_localization.cpp
@@ -1,10 +1,8 @@
 #include "card_localization.h"
 
 #include <QHash>
-#include <QList>
 #include <QLocale>
 #include <QStringList>
-#include <utility>
 
 namespace CardLocalization
 {
diff --git a/libcockatrice_card/libcockatrice/card/card_localization.h b/libcockatrice_card/libcockatrice/card/card_localization.h
index ee2aaa9b7..1bde506cb 100644
--- a/libcockatrice_card/libcockatrice/card/card_localization.h
+++ b/libcockatrice_card/libcockatrice/card/card_localization.h
@@ -1,8 +1,6 @@
 #ifndef CARD_LOCALIZATION_H
 #define CARD_LOCALIZATION_H
 
-#include <QLatin1String>
-#include <QSharedPointer>
 #include <QString>
 #include <QStringList>
 
diff --git a/libcockatrice_card/libcockatrice/card/database/card_database.cpp b/libcockatrice_card/libcockatrice/card/database/card_database.cpp
index 7b0d5b2f9..209b9d2c2 100644
--- a/libcockatrice_card/libcockatrice/card/database/card_database.cpp
+++ b/libcockatrice_card/libcockatrice/card/database/card_database.cpp
@@ -1,28 +1,17 @@
 #include "card_database.h"
 
 #include "../relation/card_relation.h"
-#include "libcockatrice/card/database/card_database_data.h"
-#include "libcockatrice/card/database/card_database_loader.h"
-#include "libcockatrice/card/database/card_database_querier.h"
-#include "libcockatrice/card/database/parser/card_database_parser.h"
-#include "libcockatrice/card/format/format_legality_rules.h"
-#include "libcockatrice/card/printing/printing_info.h"
-#include "libcockatrice/card/set/card_set.h"
-#include "libcockatrice/card/set/card_set_list.h"
+#include "card_database_manager.h"
+#include "parser/cockatrice_xml_4.h"
 
+#include <QCryptographicHash>
 #include <QDebug>
-#include <QList>
-#include <QMessageLogger>
-#include <QMetaObject>
-#include <QMetaType>
-#include <QMutexLocker>
-#include <QSharedPointer>
+#include <QDirIterator>
+#include <QFile>
+#include <QRegularExpression>
+#include <algorithm>
 #include <utility>
 
-class ICardDatabasePathProvider;
-class ICardPreferenceProvider;
-class ICardSetPriorityController;
-
 CardDatabase::CardDatabase(QObject *parent,
                            ICardPreferenceProvider *prefs,
                            ICardDatabasePathProvider *pathProvider,
@@ -34,7 +23,7 @@ CardDatabase::CardDatabase(QObject *parent,
     qRegisterMetaType<CardDatabaseData>("CardDatabaseData");
 
     // create loader and wire it up
-    loader = new CardDatabaseLoader(this, this, pathProvider, setPriorityController);
+    loader = new CardDatabaseLoader(this, this, pathProvider, prefs, setPriorityController);
     // re-emit loader signals (so other code doesn't need to know about internals)
     connect(loader, &CardDatabaseLoader::loadingFinished, this, &CardDatabase::cardDatabaseLoadingFinished);
     connect(loader, &CardDatabaseLoader::loadingFailed, this, &CardDatabase::cardDatabaseLoadingFailed);
@@ -79,19 +68,15 @@ void CardDatabase::loadCardDatabases()
 
 void CardDatabase::reloadCardDatabasesAndNotify()
 {
-    // An explicit reload bypasses the binary cache so the files on disk are
-    // always re-read, even when their size/mtime hash still matches the cache.
-    // Models refresh from the swap's cardDatabaseReset in a single batch, so
-    // no cardDatabaseEnabledSetsChanged is emitted here: that rebuilt the
-    // 36k-card models a second time on the GUI thread, which froze startup
-    // after enabling new/custom sets. The follow-up unknown-sets check is
-    // queued to the GUI thread so it sees the swapped-in data (this may run
-    // on a worker via QtConcurrent::run); it is silent unless new sets
-    // appeared mid-reload.
-    loadStatus = loader->loadCardDatabases(/* ignoreCache */ true);
+    loadCardDatabases();
 
     if (loadStatus == Ok) {
-        QMetaObject::invokeMethod(this, &CardDatabase::checkUnknownSets, Qt::AutoConnection);
+        checkUnknownSets();
+        // A reload reconstructs the exact same enabled-set state, so the cached
+        // set-name / alt-name data computed during construction is still valid.
+        // Skipping the per-card refresh avoids a full 36k-card recompute that
+        // would otherwise duplicate the work already done while building cards.
+        notifyEnabledSetsChanged(false);
     }
 }
 
@@ -210,19 +195,15 @@ void CardDatabase::checkUnknownSets()
         if (numUnknownSets > 0) {
             emit cardDatabaseNewSetsFound(numUnknownSets, unknownSetNames);
         } else {
-            _sets.markAllAsKnownBatched(setPriorityController);
+            _sets.markAllAsKnown();
         }
     } else {
         // No set enabled. Probably this is the first time running trice
-        _sets.enableAllBatched(setPriorityController);
+        _sets.guessSortKeys();
         _sets.sortByKey();
+        _sets.enableAll();
+        notifyEnabledSetsChanged();
 
-        // No cardDatabaseEnabledSetsChanged here: the reload chained off
-        // cardDatabaseAllNewSetsEnabled re-parses with the sets enabled and its
-        // swap's cardDatabaseReset rebuilds the models in one batch. Emitting
-        // both back-to-back rebuilt the 36k-card models twice on the GUI thread,
-        // stalling startup. (When the card list is empty the slot returns early
-        // without reloading, but there is nothing to display either.)
         emit cardDatabaseAllNewSetsEnabled();
     }
 }
@@ -230,13 +211,13 @@ void CardDatabase::checkUnknownSets()
 void CardDatabase::enableAllUnknownSets()
 {
     auto _sets = getSetList();
-    _sets.enableAllUnknownBatched(setPriorityController);
+    _sets.enableAllUnknown();
 }
 
 void CardDatabase::markAllSetsAsKnown()
 {
     auto _sets = getSetList();
-    _sets.markAllAsKnownBatched(setPriorityController);
+    _sets.markAllAsKnown();
 }
 
 void CardDatabase::notifyEnabledSetsChanged(bool recomputeCachedSets)
diff --git a/libcockatrice_card/libcockatrice/card/database/card_database.h b/libcockatrice_card/libcockatrice/card/database/card_database.h
index 9f0d67b67..b10e3c726 100644
--- a/libcockatrice_card/libcockatrice/card/database/card_database.h
+++ b/libcockatrice_card/libcockatrice/card/database/card_database.h
@@ -2,26 +2,18 @@
 #define CARDDATABASE_H
 
 #include "../set/card_set_list.h"
-#include "card_database_loader.h"
-
-// IWYU pragma: keep
-// CardDatabaseData is passed by value to the swapInDatabaseData() slot, and
-// CardInfoPtr is passed by value to the cardAdded()/cardRemoved() signals, so
-// the moc-generated code needs the complete types.
 #include "card_database_data.h"
-#include "libcockatrice/card/card_info.h"
+#include "card_database_loader.h"
+#include "card_database_querier.h"
 
 #include <QBasicMutex>
+#include <QDate>
+#include <QHash>
+#include <QList>
 #include <QLoggingCategory>
-#include <QObject>
-#include <QString>
-#include <QStringList>
-#include <qtmetamacros.h>
-
-class CardDatabaseQuerier;
-class ICardDatabasePathProvider;
-class ICardPreferenceProvider;
-class ICardSetPriorityController;
+#include <QVector>
+#include <libcockatrice/interfaces/interface_card_database_path_provider.h>
+#include <utility>
 
 inline Q_LOGGING_CATEGORY(CardDatabaseLog, "card_database");
 
@@ -177,12 +169,8 @@ public slots:
 
     void addFormat(const FormatRulesPtr &format);
 
-    /** @brief Loads card databases from configured paths, using the binary cache when valid. */
+    /** @brief Loads card databases from configured paths. */
     void loadCardDatabases();
-    /**
-     * @brief Reloads card databases from disk, bypassing the binary cache,
-     *        and notifies observers of the fresh state.
-     */
     void reloadCardDatabasesAndNotify();
 
     /** @brief Saves custom tokens to file.
diff --git a/libcockatrice_card/libcockatrice/card/database/card_database_cache.cpp b/libcockatrice_card/libcockatrice/card/database/card_database_cache.cpp
index 4ab4d1fca..3165ff871 100644
--- a/libcockatrice_card/libcockatrice/card/database/card_database_cache.cpp
+++ b/libcockatrice_card/libcockatrice/card/database/card_database_cache.cpp
@@ -4,32 +4,15 @@
 #include "../format/format_legality_rules.h"
 #include "../printing/printing_info.h"
 #include "../relation/card_relation.h"
+#include "../relation/card_relation_type.h"
 #include "../set/card_set.h"
 #include "card_database_loader.h"
-#include "libcockatrice/card/database/card_database_data.h"
-#include "libcockatrice/card/lazy_properties_hash.h"
 
 #include <QBuffer>
-#include <QByteArray>
 #include <QDataStream>
-#include <QDate>
-#include <QDebug>
 #include <QElapsedTimer>
 #include <QFile>
-#include <QIODevice>
-#include <QList>
-#include <QLoggingCategory>
-#include <QMap>
-#include <QMessageLogger>
 #include <QSaveFile>
-#include <QSet>
-#include <QSharedPointer>
-#include <QtGlobal>
-#include <qnamespace.h>
-
-class ICardSetPriorityController;
-enum class CardRelationType;
-template <typename Key, typename T> class QHash;
 
 namespace
 {
diff --git a/libcockatrice_card/libcockatrice/card/database/card_database_cache.h b/libcockatrice_card/libcockatrice/card/database/card_database_cache.h
index 178b3ac6e..40ff96541 100644
--- a/libcockatrice_card/libcockatrice/card/database/card_database_cache.h
+++ b/libcockatrice_card/libcockatrice/card/database/card_database_cache.h
@@ -1,11 +1,10 @@
 #ifndef CARDDATABASE_CACHE_H
 #define CARDDATABASE_CACHE_H
 
-#include <QString>
+#include "card_database_data.h"
 
-class ICardSetPriorityController;
-class QByteArray;
-struct CardDatabaseData;
+#include <QByteArray>
+#include <libcockatrice/interfaces/interface_card_set_priority_controller.h>
 
 namespace CardDatabaseCache
 {
diff --git a/libcockatrice_card/libcockatrice/card/database/card_database_loader.cpp b/libcockatrice_card/libcockatrice/card/database/card_database_loader.cpp
index 00b21f88e..47f7eee6d 100644
--- a/libcockatrice_card/libcockatrice/card/database/card_database_loader.cpp
+++ b/libcockatrice_card/libcockatrice/card/database/card_database_loader.cpp
@@ -2,11 +2,6 @@
 
 #include "card_database.h"
 #include "card_database_cache.h"
-#include "libcockatrice/card/card_info.h"
-#include "libcockatrice/card/database/card_database_data.h"
-#include "libcockatrice/card/set/card_set.h"
-#include "libcockatrice/interfaces/interface_card_database_path_provider.h"
-#include "libcockatrice/interfaces/interface_card_set_priority_controller.h"
 #include "parser/card_database_parser.h"
 #include "parser/cockatrice_xml_3.h"
 #include "parser/cockatrice_xml_4.h"
@@ -14,43 +9,29 @@
 #include <QByteArray>
 #include <QCoreApplication>
 #include <QCryptographicHash>
-#include <QDateTime>
 #include <QDebug>
-#include <QDir>
 #include <QDirIterator>
 #include <QFile>
 #include <QFileInfo>
-#include <QIODevice>
-#include <QMessageLogger>
-#include <QMutexLocker>
-#include <QSharedPointer>
 #include <QTime>
-#include <qalgorithms.h>
-#include <utility>
-
-class ICardPreferenceProvider;
 
 CardDatabaseLoader::CardDatabaseLoader(QObject *parent,
                                        CardDatabase *db,
                                        ICardDatabasePathProvider *_pathProvider,
+                                       ICardPreferenceProvider *_preferenceProvider,
                                        ICardSetPriorityController *_priorityController)
     : QObject(parent), database(db), pathProvider(_pathProvider), priorityController(_priorityController)
 {
     // instantiate available parsers here
-    availableParsers << new CockatriceXml4Parser(_priorityController);
+    availableParsers << new CockatriceXml4Parser(_preferenceProvider, _priorityController);
     availableParsers << new CockatriceXml3Parser(_priorityController);
 
     // The load path parses into a snapshot and never emits per-card signals;
     // the finished snapshot is swapped into the live database on the GUI thread.
 
     // when SettingsCache's path changes, trigger reloads
-    connect(pathProvider, &ICardDatabasePathProvider::cardDatabasePathChanged, this, [this] {
-        loadCardDatabases();
-        // This reload runs synchronously on the emitting (GUI) thread, so the
-        // finished snapshot is already swapped in when it returns: enable any
-        // sets the newly pointed-at database introduced.
-        database->checkUnknownSets();
-    });
+    connect(pathProvider, &ICardDatabasePathProvider::cardDatabasePathChanged, this,
+            &CardDatabaseLoader::loadCardDatabases);
 }
 
 CardDatabaseLoader::~CardDatabaseLoader()
@@ -95,12 +76,12 @@ LoadStatus CardDatabaseLoader::loadCardDatabase(const QString &path, CardDatabas
     return tempLoadStatus;
 }
 
-LoadStatus CardDatabaseLoader::loadCardDatabases(bool ignoreCache)
+LoadStatus CardDatabaseLoader::loadCardDatabases()
 {
-    return doLoadCardDatabases(ignoreCache);
+    return doLoadCardDatabases();
 }
 
-LoadStatus CardDatabaseLoader::doLoadCardDatabases(bool ignoreCache)
+LoadStatus CardDatabaseLoader::doLoadCardDatabases()
 {
     QMutexLocker locker(reloadDatabaseMutex);
 
@@ -118,14 +99,9 @@ LoadStatus CardDatabaseLoader::doLoadCardDatabases(bool ignoreCache)
     LoadStatus loadStatus = NotLoaded;
 
     // Try the binary cache first: a cache hit avoids re-parsing the (large) XML.
-    // An explicit reload skips the lookup so the files on disk are always
-    // re-read, even when their size/mtime hash still matches the cache.
     const QStringList customPaths = collectCustomDatabasePaths();
     const QByteArray sourceHash = computeSourceHash(customPaths);
-    if (ignoreCache) {
-        qCInfo(CardDatabaseLoadingLog) << "Ignoring binary cache, re-parsing source files";
-    }
-    if (!ignoreCache && loadFromCache(data, sourceHash)) {
+    if (loadFromCache(data, sourceHash)) {
         qCInfo(CardDatabaseLoadingLog) << "Loaded card database from binary cache";
         loadStatus = Ok;
     } else {
@@ -142,23 +118,7 @@ LoadStatus CardDatabaseLoader::doLoadCardDatabases(bool ignoreCache)
                 loadCardDatabase(p, data);
             }
 
-            // A snapshot parsed while no set is enabled has had every printing
-            // stripped by the parsers, and the cache reader re-derives enablement
-            // from the priority controller, so such an entry can never be reused
-            // meaningfully. Skip writing it so a first-run (blank config) load
-            // cannot poison the cache with an empty snapshot. The check mirrors
-            // what the parsers saw: any set still reporting enabled means the
-            // snapshot is complete for the current enablement.
-            bool anySetEnabled = false;
-            for (const CardSetPtr &set : data.sets) {
-                if (set && set->getEnabled()) {
-                    anySetEnabled = true;
-                    break;
-                }
-            }
-            if (!data.sets.isEmpty() && !anySetEnabled) {
-                qCInfo(CardDatabaseLoadingLog) << "Skipping binary cache: no set is enabled yet, snapshot was stripped";
-            } else if (!saveToCache(data, sourceHash)) {
+            if (!saveToCache(data, sourceHash)) {
                 qCWarning(CardDatabaseLoadingLog) << "Failed to write binary cache to" << cachePath();
             }
         }
@@ -170,15 +130,18 @@ LoadStatus CardDatabaseLoader::doLoadCardDatabases(bool ignoreCache)
         database->refreshCachedReverseRelatedCards(data.cards);
 
         qCInfo(CardDatabaseLoadingSuccessOrFailureLog) << "Card Database Loading Success";
-        // NOTE: checkUnknownSets() is intentionally NOT called here. During the
-        // front-loaded parse in main() MainWindow does not exist yet, so
-        // cardDatabaseNewSetsFound / cardDatabaseAllNewSetsEnabled would be
-        // emitted with no receivers, and enabling the sets up-front would
-        // suppress the first-run experience MainWindow::startupConfigCheck()
-        // and the onboarding wizard are designed around. Callers that load
-        // after startup own the check (and any reload it triggers).
         emit databaseDataReady(std::move(data));
         emit loadingFinished();
+        // During the front-loaded parse in main() this runs before MainWindow
+        // exists, so cardDatabaseNewSetsFound / cardDatabaseAllNewSetsEnabled
+        // would be emitted with no receivers.  Skip the check on the first load;
+        // MainWindow::startupConfigCheck() calls checkUnknownSets() once its
+        // signal connections are live.  On subsequent reloads (e.g. path change)
+        // MainWindow exists and signals have live receivers.
+        if (initialLoadComplete) {
+            database->checkUnknownSets();
+        }
+        initialLoadComplete = true;
     } else {
         qCInfo(CardDatabaseLoadingSuccessOrFailureLog) << "Card Database Loading Failed";
         emit loadingFailed(); // bring up the settings dialog
@@ -203,12 +166,6 @@ QByteArray CardDatabaseLoader::computeSourceHash(const QStringList &customPaths)
     hash.addData(QCoreApplication::applicationVersion().toUtf8());
     hash.addData(QByteArray(1, '\0'));
 
-    // Include parser schema version to invalidate caches when parser behavior changes.
-    // Increment this if the parser logic changes in a way that affects cached data.
-    static const char SCHEMA_VERSION[] = "carddb-parse-schema-v1";
-    hash.addData(QByteArray(SCHEMA_VERSION, sizeof(SCHEMA_VERSION) - 1));
-    hash.addData(QByteArray(1, '\0'));
-
     const QStringList inputs = QStringList()
                                << pathProvider->getCardDatabasePath() << pathProvider->getTokenDatabasePath()
                                << pathProvider->getSpoilerCardDatabasePath() << customPaths;
@@ -223,17 +180,6 @@ QByteArray CardDatabaseLoader::computeSourceHash(const QStringList &customPaths)
             hash.addData(QByteArray(1, '\0'));
         }
     }
-
-    // The parsers drop printings of disabled sets at parse time, so the cached
-    // snapshot depends on enablement: fold the enabled set names in so that
-    // toggling a set invalidates the cache and forces a re-parse.
-    if (priorityController) {
-        const QStringList enabledSets = priorityController->getEnabledSetNames();
-        for (const QString &setName : enabledSets) {
-            hash.addData(setName.toUtf8());
-            hash.addData(QByteArray(1, '\0'));
-        }
-    }
     return hash.result();
 }
 
diff --git a/libcockatrice_card/libcockatrice/card/database/card_database_loader.h b/libcockatrice_card/libcockatrice/card/database/card_database_loader.h
index bfbaa0f51..6dcb06bf2 100644
--- a/libcockatrice_card/libcockatrice/card/database/card_database_loader.h
+++ b/libcockatrice_card/libcockatrice/card/database/card_database_loader.h
@@ -2,21 +2,12 @@
 #define COCKATRICE_CARD_DATABASE_LOADER_H
 
 #include <QBasicMutex>
-#include <QByteArray>
 #include <QList>
 #include <QLoggingCategory>
-#include <QObject>
-#include <QString>
-#include <QStringList>
-#include <qtmetamacros.h>
-
-class ICardDatabasePathProvider;
-class ICardSetPriorityController;
-
-// IWYU pragma: keep
-// CardDatabaseData is passed by value to the databaseDataReady() signal, so the
-// moc-generated code needs the complete type.
-#include "card_database_data.h"
+#include <libcockatrice/card/database/card_database_data.h>
+#include <libcockatrice/interfaces/interface_card_database_path_provider.h>
+#include <libcockatrice/interfaces/interface_card_preference_provider.h>
+#include <libcockatrice/interfaces/interface_card_set_priority_controller.h>
 
 inline Q_LOGGING_CATEGORY(CardDatabaseLoadingLog, "card_database.loading");
 inline Q_LOGGING_CATEGORY(CardDatabaseLoadingSuccessOrFailureLog, "card_database.loading.success_or_failure");
@@ -58,10 +49,12 @@ public:
      * @param parent QObject parent.
      * @param db Pointer to the CardDatabase to populate (non-owning).
      * @param pathProvider Provider for card database file paths.
+     * @param preferenceProvider Optional card preference provider for pinned printings.
      */
     explicit CardDatabaseLoader(QObject *parent,
                                 CardDatabase *db,
                                 ICardDatabasePathProvider *pathProvider,
+                                ICardPreferenceProvider *preferenceProvider,
                                 ICardSetPriorityController *_priorityController);
 
     /** @brief Destructor cleans up allocated parsers. */
@@ -73,13 +66,9 @@ public slots:
      *
      * Runs synchronously on the calling thread.  The caller should ensure
      * that any signal receivers are already connected before invoking this.
-     * @param ignoreCache Skip the binary cache lookup and re-parse the source
-     *        files from disk, refreshing the cache afterwards. Used for
-     *        explicit reloads so that edits the source hash cannot see are
-     *        still picked up.
      * @return Status of the main database load.
      */
-    LoadStatus loadCardDatabases(bool ignoreCache = false);
+    LoadStatus loadCardDatabases();
 
     /**
      * @brief Loads a single card database file into the given snapshot.
@@ -132,10 +121,9 @@ private:
 
     /**
      * @brief Performs the actual load work synchronously on the calling thread.
-     * @param ignoreCache Skip the binary cache lookup and re-parse from disk.
      * @return Status of the main database load.
      */
-    LoadStatus doLoadCardDatabases(bool ignoreCache);
+    LoadStatus doLoadCardDatabases();
 
     /**
      * @brief Collects custom card database paths recursively.
@@ -179,6 +167,7 @@ private:
 
     QBasicMutex *loadFromFileMutex = new QBasicMutex();   /**< Mutex for single-file loading. */
     QBasicMutex *reloadDatabaseMutex = new QBasicMutex(); /**< Mutex for reloading entire database. */
+    bool initialLoadComplete = false;                     /**< Set after the first successful load. */
 };
 
 #endif // COCKATRICE_CARD_DATABASE_LOADER_H
diff --git a/libcockatrice_card/libcockatrice/card/database/card_database_manager.cpp b/libcockatrice_card/libcockatrice/card/database/card_database_manager.cpp
index b06c258fa..614b4a7f8 100644
--- a/libcockatrice_card/libcockatrice/card/database/card_database_manager.cpp
+++ b/libcockatrice_card/libcockatrice/card/database/card_database_manager.cpp
@@ -1,16 +1,9 @@
 #include "card_database_manager.h"
 
-#include "libcockatrice/card/database/card_database.h"
-
 #include <libcockatrice/interfaces/noop_card_database_path_provider.h>
 #include <libcockatrice/interfaces/noop_card_preference_provider.h>
 #include <libcockatrice/interfaces/noop_card_set_priority_controller.h>
 
-class CardDatabaseQuerier;
-class ICardDatabasePathProvider;
-class ICardPreferenceProvider;
-class ICardSetPriorityController;
-
 ICardPreferenceProvider *CardDatabaseManager::cardPreferenceProvider = new NoopCardPreferenceProvider();
 ICardDatabasePathProvider *CardDatabaseManager::pathProvider = new NoopCardDatabasePathProvider();
 ICardSetPriorityController *CardDatabaseManager::setPriorityController = new NoopCardSetPriorityController();
diff --git a/libcockatrice_card/libcockatrice/card/database/card_database_manager.h b/libcockatrice_card/libcockatrice/card/database/card_database_manager.h
index 074154a41..c7de66a25 100644
--- a/libcockatrice_card/libcockatrice/card/database/card_database_manager.h
+++ b/libcockatrice_card/libcockatrice/card/database/card_database_manager.h
@@ -2,12 +2,7 @@
 #define CARD_DATABASE_ACCESSOR_H
 
 #pragma once
-
-class CardDatabase;
-class CardDatabaseQuerier;
-class ICardDatabasePathProvider;
-class ICardPreferenceProvider;
-class ICardSetPriorityController;
+#include "card_database.h"
 
 /**
  * @class CardDatabaseManager
diff --git a/libcockatrice_card/libcockatrice/card/database/card_database_querier.cpp b/libcockatrice_card/libcockatrice/card/database/card_database_querier.cpp
index 2fad5212d..5b9c5a4b5 100644
--- a/libcockatrice_card/libcockatrice/card/database/card_database_querier.cpp
+++ b/libcockatrice_card/libcockatrice/card/database/card_database_querier.cpp
@@ -4,15 +4,8 @@
 #include "../printing/exact_card.h"
 #include "../set/card_set_comparator.h"
 #include "card_database.h"
-#include "libcockatrice/card/set/card_set.h"
-#include "libcockatrice/interfaces/interface_card_preference_provider.h"
-#include "libcockatrice/utility/card_ref.h"
 
-#include <QLatin1String>
-#include <QRandomGenerator>
-#include <QSharedPointer>
-#include <QStringLiteral>
-#include <qnamespace.h>
+#include <qrandom.h>
 
 CardDatabaseQuerier::CardDatabaseQuerier(QObject *_parent,
                                          const CardDatabase *_db,
diff --git a/libcockatrice_card/libcockatrice/card/database/card_database_querier.h b/libcockatrice_card/libcockatrice/card/database/card_database_querier.h
index a1409b3cc..f195a8170 100644
--- a/libcockatrice_card/libcockatrice/card/database/card_database_querier.h
+++ b/libcockatrice_card/libcockatrice/card/database/card_database_querier.h
@@ -3,18 +3,12 @@
 
 #include "../card_info.h"
 #include "../printing/exact_card.h"
-#include "libcockatrice/card/printing/printing_info.h"
 
-#include <QList>
-#include <QMap>
 #include <QObject>
-#include <QString>
-#include <QStringList>
-#include <qtmetamacros.h>
+#include <libcockatrice/interfaces/interface_card_preference_provider.h>
+#include <libcockatrice/utility/card_ref.h>
 
 class CardDatabase;
-class ICardPreferenceProvider;
-struct CardRef;
 
 /**
  * @class CardDatabaseQuerier
diff --git a/libcockatrice_card/libcockatrice/card/database/parser/card_database_parser.cpp b/libcockatrice_card/libcockatrice/card/database/parser/card_database_parser.cpp
index 1374533ca..00ed9377d 100644
--- a/libcockatrice_card/libcockatrice/card/database/parser/card_database_parser.cpp
+++ b/libcockatrice_card/libcockatrice/card/database/parser/card_database_parser.cpp
@@ -1,11 +1,6 @@
 #include "card_database_parser.h"
 
-#include "libcockatrice/card/card_info.h"
-#include "libcockatrice/card/database/card_database_data.h"
-
-#include <QSharedPointer>
-
-class ICardSetPriorityController;
+#include <libcockatrice/interfaces/noop_card_set_priority_controller.h>
 
 SetNameMap ICardDatabaseParser::sets;
 
diff --git a/libcockatrice_card/libcockatrice/card/database/parser/card_database_parser.h b/libcockatrice_card/libcockatrice/card/database/parser/card_database_parser.h
index b82d9aed7..6d9c91260 100644
--- a/libcockatrice_card/libcockatrice/card/database/parser/card_database_parser.h
+++ b/libcockatrice_card/libcockatrice/card/database/parser/card_database_parser.h
@@ -2,17 +2,10 @@
 #define CARDDATABASE_PARSER_H
 
 #include "../../card_info.h"
-#include "libcockatrice/card/database/parser/card_database_parser.h"
-#include "libcockatrice/card/set/card_set.h"
+#include "../card_database_data.h"
 
-#include <QDate>
-#include <QObject>
+#include <QIODevice>
 #include <QString>
-#include <qtmetamacros.h>
-
-class ICardSetPriorityController;
-class QIODevice;
-struct CardDatabaseData;
 
 #define COCKATRICE_XML_XSI_NAMESPACE "http://www.w3.org/2001/XMLSchema-instance"
 
diff --git a/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp b/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp
index b17eb8b5e..64202ab21 100644
--- a/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp
+++ b/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp
@@ -2,33 +2,13 @@
 
 #include "../../relation/card_relation.h"
 #include "../../relation/card_relation_type.h"
-#include "libcockatrice/card/database/card_database_data.h"
-#include "libcockatrice/card/database/parser/card_database_parser.h"
-#include "libcockatrice/card/lazy_properties_hash.h"
-#include "libcockatrice/card/printing/printing_info.h"
-#include "libcockatrice/card/set/card_set.h"
 
-#include <QChar>
 #include <QCoreApplication>
-#include <QDate>
-#include <QDateTime>
 #include <QDebug>
 #include <QFile>
-#include <QHash>
-#include <QIODevice>
-#include <QList>
-#include <QMessageLogger>
-#include <QSharedPointer>
-#include <QStringView>
-#include <QXmlStreamAttributes>
 #include <QXmlStreamReader>
-#include <QXmlStreamWriter>
-#include <QtGlobal>
-#include <qnamespace.h>
 #include <version_string.h>
 
-class ICardSetPriorityController;
-
 #define COCKATRICE_XML3_TAGNAME "cockatrice_carddatabase"
 #define COCKATRICE_XML3_TAGVER 3
 #define COCKATRICE_XML3_SCHEMALOCATION                                                                                 \
diff --git a/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.h b/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.h
index cb76e960d..83b736257 100644
--- a/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.h
+++ b/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.h
@@ -2,14 +2,9 @@
 #define COCKATRICE_XML3_H
 
 #include "card_database_parser.h"
-#include "libcockatrice/card/card_info.h"
 
 #include <QLoggingCategory>
-#include <QString>
-#include <qtmetamacros.h>
-
-class ICardSetPriorityController;
-class QXmlStreamReader;
+#include <QXmlStreamReader>
 
 inline Q_LOGGING_CATEGORY(CockatriceXml3Log, "cockatrice_xml.xml_3_parser");
 
diff --git a/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp b/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp
index 4d975e533..19e972a7a 100644
--- a/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp
+++ b/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp
@@ -1,44 +1,22 @@
 #include "cockatrice_xml_4.h"
 
 #include "../../relation/card_relation.h"
-#include "libcockatrice/card/database/card_database_data.h"
-#include "libcockatrice/card/database/parser/card_database_parser.h"
-#include "libcockatrice/card/lazy_properties_hash.h"
-#include "libcockatrice/card/printing/printing_info.h"
-#include "libcockatrice/card/relation/card_relation_type.h"
-#include "libcockatrice/card/set/card_set.h"
-#include "libcockatrice/interfaces/interface_card_preference_provider.h"
 
 #include <QCoreApplication>
-#include <QDate>
-#include <QDateTime>
 #include <QDebug>
 #include <QFile>
-#include <QIODevice>
-#include <QList>
-#include <QMap>
-#include <QMessageLogger>
-#include <QSharedPointer>
-#include <QStringList>
-#include <QStringView>
-#include <QXmlStreamAttribute>
-#include <QXmlStreamAttributes>
 #include <QXmlStreamReader>
-#include <QXmlStreamWriter>
 #include <libcockatrice/card/format/format_legality_rules.h>
-#include <qnamespace.h>
-#include <utility>
 #include <version_string.h>
 
-class ICardSetPriorityController;
-
 #define COCKATRICE_XML4_TAGNAME "cockatrice_carddatabase"
 #define COCKATRICE_XML4_TAGVER 4
 #define COCKATRICE_XML4_SCHEMALOCATION                                                                                 \
     "https://raw.githubusercontent.com/Cockatrice/Cockatrice/master/doc/carddatabase_v4/cards.xsd"
 
-CockatriceXml4Parser::CockatriceXml4Parser(ICardSetPriorityController *_cardSetPriorityController)
-    : ICardDatabaseParser(_cardSetPriorityController)
+CockatriceXml4Parser::CockatriceXml4Parser(ICardPreferenceProvider *_cardPreferenceProvider,
+                                           ICardSetPriorityController *_cardSetPriorityController)
+    : ICardDatabaseParser(_cardSetPriorityController), cardPreferenceProvider(_cardPreferenceProvider)
 {
 }
 
@@ -283,6 +261,7 @@ QHash<QString, QString> CockatriceXml4Parser::loadCardPropertiesFromXml(QXmlStre
 
 void CockatriceXml4Parser::loadCardsFromXml(QXmlStreamReader &xml)
 {
+    bool includeRebalancedCards = cardPreferenceProvider->getIncludeRebalancedCards();
     while (!xml.atEnd()) {
         if (xml.readNext() == QXmlStreamReader::EndElement) {
             break;
@@ -384,7 +363,17 @@ void CockatriceXml4Parser::loadCardsFromXml(QXmlStreamReader &xml)
                             printingProps.insert(attrName, attr.value().toString());
                         }
                         PrintingInfo printingInfo(set, LazyPropertiesHash(printingProps));
-                        _sets[setName].append(printingInfo);
+
+                        // This is very much a hack and not the right place to
+                        // put this check, as it requires a reload of Cockatrice
+                        // to be apply.
+                        //
+                        // However, this is also true of the `set->getEnabled()`
+                        // check above (which is currently bugged as well), so
+                        // we'll fix both at the same time.
+                        if (includeRebalancedCards || printingInfo.getProperty("isRebalanced") != "true") {
+                            _sets[setName].append(printingInfo);
+                        }
                     }
                     // related cards
                 } else if (xmlName == "related" || xmlName == "reverse-related") {
diff --git a/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.h b/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.h
index 390282796..55f7c5a3b 100644
--- a/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.h
+++ b/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.h
@@ -2,15 +2,10 @@
 #define COCKATRICE_XML4_H
 
 #include "card_database_parser.h"
-#include "libcockatrice/card/card_info.h"
 
-#include <QHash>
 #include <QLoggingCategory>
-#include <QString>
-#include <qtmetamacros.h>
-
-class ICardSetPriorityController;
-class QXmlStreamReader;
+#include <QXmlStreamReader>
+#include <libcockatrice/interfaces/interface_card_preference_provider.h>
 
 inline Q_LOGGING_CATEGORY(CockatriceXml4Log, "cockatrice_xml.xml_4_parser");
 
@@ -26,6 +21,7 @@ inline Q_LOGGING_CATEGORY(CockatriceXml4Log, "cockatrice_xml.xml_4_parser");
  * @note Differences from v3:
  * - Card properties are stored in <prop> blocks as a QHash<QString, QString>.
  * - Sets can include a <priority> element.
+ * - Supports user preferences via ICardPreferenceProvider (e.g., skipping rebalanced cards).
  * - Related cards support persistent relations and multiple attach types (e.g., transform).
  * - More robust serialization; easier to extend schema in the future.
  */
@@ -33,7 +29,8 @@ class CockatriceXml4Parser : public ICardDatabaseParser
 {
     Q_OBJECT
 public:
-    explicit CockatriceXml4Parser(ICardSetPriorityController *cardSetPriorityController);
+    explicit CockatriceXml4Parser(ICardPreferenceProvider *cardPreferenceProvider,
+                                  ICardSetPriorityController *cardSetPriorityController);
     ~CockatriceXml4Parser() override = default;
 
     /**
@@ -68,6 +65,8 @@ public:
                     const QString &sourceVersion = "unknown") override;
 
 private:
+    ICardPreferenceProvider *cardPreferenceProvider; ///< Interface to handle user preferences
+
     /**
      * @brief Loads a generic <prop> block from a <card> element.
      * @param xml The open QXmlStreamReader positioned at a <prop> element.
@@ -78,6 +77,7 @@ private:
     /**
      * @brief Load all <card> elements from the XML stream.
      * @param xml The open QXmlStreamReader positioned at the <cards> element.
+     * Honors the user's preference regarding rebalanced cards.
      */
     void loadCardsFromXml(QXmlStreamReader &xml);
 
diff --git a/libcockatrice_card/libcockatrice/card/format/format_legality_rules.cpp b/libcockatrice_card/libcockatrice/card/format/format_legality_rules.cpp
index 64785759e..a6b3bb038 100644
--- a/libcockatrice_card/libcockatrice/card/format/format_legality_rules.cpp
+++ b/libcockatrice_card/libcockatrice/card/format/format_legality_rules.cpp
@@ -1,9 +1,6 @@
 #include "format_legality_rules.h"
 
-#include <QRegularExpression>
-#include <QRegularExpressionMatch>
 #include <libcockatrice/card/card_info.h>
-#include <qnamespace.h>
 
 bool cardMatchesCondition(const CardInfo &card, const CardCondition &cond)
 {
diff --git a/libcockatrice_card/libcockatrice/card/format/format_legality_rules.h b/libcockatrice_card/libcockatrice/card/format/format_legality_rules.h
index 15ba46728..8778ab17e 100644
--- a/libcockatrice_card/libcockatrice/card/format/format_legality_rules.h
+++ b/libcockatrice_card/libcockatrice/card/format/format_legality_rules.h
@@ -1,12 +1,11 @@
 #ifndef COCKATRICE_FORMAT_LEGALITY_RULES_H
 #define COCKATRICE_FORMAT_LEGALITY_RULES_H
 
-#include <QList>
+#include <QRegularExpression>
 #include <QSharedPointer>
 #include <QString>
 
 class CardInfo;
-
 using CardInfoPtr = QSharedPointer<CardInfo>;
 
 struct CardCondition
diff --git a/libcockatrice_card/libcockatrice/card/import/card_name_normalizer.cpp b/libcockatrice_card/libcockatrice/card/import/card_name_normalizer.cpp
index 975f7f2d6..91ebd6647 100644
--- a/libcockatrice_card/libcockatrice/card/import/card_name_normalizer.cpp
+++ b/libcockatrice_card/libcockatrice/card/import/card_name_normalizer.cpp
@@ -2,14 +2,8 @@
 
 #include "../database/card_database_manager.h"
 #include "../printing/exact_card.h"
-#include "libcockatrice/card/database/card_database_querier.h"
 
-#include <QHash>
-#include <QList>
 #include <QRegularExpression>
-#include <QStringList>
-#include <libcockatrice/utility/card_ref.h>
-#include <utility>
 
 /**
  * @brief Resolves the complete display name of a card.
diff --git a/libcockatrice_card/libcockatrice/card/lazy_properties_hash.cpp b/libcockatrice_card/libcockatrice/card/lazy_properties_hash.cpp
index a12de469b..4d903a3bd 100644
--- a/libcockatrice_card/libcockatrice/card/lazy_properties_hash.cpp
+++ b/libcockatrice_card/libcockatrice/card/lazy_properties_hash.cpp
@@ -1,8 +1,6 @@
 #include "lazy_properties_hash.h"
 
-#include <QDataStream>
-#include <QMutexLocker>
-#include <QSharedPointer>
+#include <QIODevice>
 
 LazyPropertiesHash::LazyPropertiesHash() : isMaterialized(true)
 {
diff --git a/libcockatrice_card/libcockatrice/card/lazy_properties_hash.h b/libcockatrice_card/libcockatrice/card/lazy_properties_hash.h
index 04f5d0251..0ed8c215b 100644
--- a/libcockatrice_card/libcockatrice/card/lazy_properties_hash.h
+++ b/libcockatrice_card/libcockatrice/card/lazy_properties_hash.h
@@ -1,10 +1,8 @@
 #ifndef COCKATRICE_LAZY_PROPERTIES_HASH_H
 #define COCKATRICE_LAZY_PROPERTIES_HASH_H
 
-#include <QByteArray>
 #include <QHash>
 #include <QMutex>
-#include <QString>
 
 /**
  * @brief A property map that can lazily deserialize blobs to avoid loading overhead.
diff --git a/libcockatrice_card/libcockatrice/card/printing/exact_card.cpp b/libcockatrice_card/libcockatrice/card/printing/exact_card.cpp
index 19e902b27..993b5b96e 100644
--- a/libcockatrice_card/libcockatrice/card/printing/exact_card.cpp
+++ b/libcockatrice_card/libcockatrice/card/printing/exact_card.cpp
@@ -3,10 +3,6 @@
 #include "../card_info.h"
 #include "printing_info.h"
 
-#include <QLatin1String>
-#include <QSharedPointer>
-#include <qtmetamacros.h>
-
 /**
  * Default constructor.
  * This will set the CardInfoPtr to null.
diff --git a/libcockatrice_card/libcockatrice/card/printing/exact_card.h b/libcockatrice_card/libcockatrice/card/printing/exact_card.h
index ea49072fb..74fc75da3 100644
--- a/libcockatrice_card/libcockatrice/card/printing/exact_card.h
+++ b/libcockatrice_card/libcockatrice/card/printing/exact_card.h
@@ -2,11 +2,6 @@
 #define EXACT_CARD_H
 
 #include "../card_info.h"
-#include "libcockatrice/card/printing/printing_info.h"
-
-#include <QByteArray>
-#include <QMetaType>
-#include <QString>
 
 /**
  * @class ExactCard
diff --git a/libcockatrice_card/libcockatrice/card/printing/printing_info.cpp b/libcockatrice_card/libcockatrice/card/printing/printing_info.cpp
index 654efac5e..3d185583a 100644
--- a/libcockatrice_card/libcockatrice/card/printing/printing_info.cpp
+++ b/libcockatrice_card/libcockatrice/card/printing/printing_info.cpp
@@ -2,6 +2,9 @@
 
 #include "../set/card_set.h"
 
+#include <QDataStream>
+#include <QIODevice>
+
 PrintingInfo::PrintingInfo(const CardSetPtr &_set, const LazyPropertiesHash &_properties)
     : set(_set), properties(_properties)
 {
diff --git a/libcockatrice_card/libcockatrice/card/printing/printing_info.h b/libcockatrice_card/libcockatrice/card/printing/printing_info.h
index 038960e86..974c7bb95 100644
--- a/libcockatrice_card/libcockatrice/card/printing/printing_info.h
+++ b/libcockatrice_card/libcockatrice/card/printing/printing_info.h
@@ -4,12 +4,9 @@
 #include "../set/card_set.h"
 #include "libcockatrice/card/lazy_properties_hash.h"
 
-#include <QHash>
 #include <QList>
 #include <QMap>
 #include <QSharedPointer>
-#include <QString>
-#include <QStringList>
 
 class PrintingInfo;
 
diff --git a/libcockatrice_card/libcockatrice/card/relation/card_relation.cpp b/libcockatrice_card/libcockatrice/card/relation/card_relation.cpp
index 410b25682..8903c892d 100644
--- a/libcockatrice_card/libcockatrice/card/relation/card_relation.cpp
+++ b/libcockatrice_card/libcockatrice/card/relation/card_relation.cpp
@@ -1,5 +1,7 @@
 #include "card_relation.h"
 
+#include "card_relation_type.h"
+
 CardRelation::CardRelation(const QString &_name,
                            CardRelationType _attachType,
                            bool _isCreateAllExclusion,
diff --git a/libcockatrice_card/libcockatrice/card/relation/card_relation.h b/libcockatrice_card/libcockatrice/card/relation/card_relation.h
index 3a1366f2b..a1864f5b2 100644
--- a/libcockatrice_card/libcockatrice/card/relation/card_relation.h
+++ b/libcockatrice_card/libcockatrice/card/relation/card_relation.h
@@ -5,7 +5,6 @@
 
 #include <QObject>
 #include <QString>
-#include <qtmetamacros.h>
 
 /**
  * @class CardRelation
diff --git a/libcockatrice_card/libcockatrice/card/set/card_set.cpp b/libcockatrice_card/libcockatrice/card/set/card_set.cpp
index e873eeeab..92060f6c4 100644
--- a/libcockatrice_card/libcockatrice/card/set/card_set.cpp
+++ b/libcockatrice_card/libcockatrice/card/set/card_set.cpp
@@ -1,7 +1,5 @@
 #include "card_set.h"
 
-#include "libcockatrice/interfaces/interface_card_set_priority_controller.h"
-
 #include <QSet>
 #include <utility>
 
diff --git a/libcockatrice_card/libcockatrice/card/set/card_set.h b/libcockatrice_card/libcockatrice/card/set/card_set.h
index b9ac74e2d..8e16e01df 100644
--- a/libcockatrice_card/libcockatrice/card/set/card_set.h
+++ b/libcockatrice_card/libcockatrice/card/set/card_set.h
@@ -5,14 +5,12 @@
 #include <QList>
 #include <QSharedPointer>
 #include <QString>
+#include <libcockatrice/interfaces/interface_card_set_priority_controller.h>
 
 class CardInfo;
-class ICardSetPriorityController;
-
 using CardInfoPtr = QSharedPointer<CardInfo>;
 
 class CardSet;
-
 using CardSetPtr = QSharedPointer<CardSet>;
 
 /**
@@ -227,10 +225,6 @@ public:
      * @param _isknown True if known, false if unknown.
      */
     void setIsKnown(bool _isknown);
-    void setIsKnownInMemory(bool _isknown)
-    {
-        isknown = _isknown;
-    }
 
     /**
      * @brief Determines whether the set has incomplete metadata and should be ignored.
diff --git a/libcockatrice_card/libcockatrice/card/set/card_set_list.cpp b/libcockatrice_card/libcockatrice/card/set/card_set_list.cpp
index c4faf1c4c..8d6aa7365 100644
--- a/libcockatrice_card/libcockatrice/card/set/card_set_list.cpp
+++ b/libcockatrice_card/libcockatrice/card/set/card_set_list.cpp
@@ -1,14 +1,5 @@
 #include "card_set_list.h"
 
-#include "libcockatrice/card/set/card_set.h"
-#include "libcockatrice/interfaces/interface_card_set_priority_controller.h"
-
-#include <QDate>
-#include <QString>
-#include <QVector>
-#include <algorithm>
-#include <compare>
-
 class CardSetList::KeyCompareFunctor
 {
 public:
@@ -64,87 +55,60 @@ QStringList CardSetList::getUnknownSetsNames()
     return sets;
 }
 
-void CardSetList::enableAllUnknownBatched(ICardSetPriorityController *controller)
+void CardSetList::enableAllUnknown()
 {
-    QVector<ICardSetPriorityController::SetSaveData> saveData;
     for (int i = 0; i < size(); ++i) {
         CardSetPtr set = at(i);
-        if (set.isNull()) {
-            continue;
+        if (set && !set->getIsKnown() && !set->getIsKnownIgnored()) {
+            set->setIsKnown(true);
+            set->setEnabled(true);
+        } else if (set && set->getIsKnownIgnored() && !set->getEnabled()) {
+            set->setEnabled(true);
         }
-
-        bool changed = false;
-        if (!set->getIsKnown() && !set->getIsKnownIgnored()) {
-            set->setIsKnownInMemory(true);
-            set->setEnabledInMemory(true);
-            changed = true;
-        } else if (set->getIsKnownIgnored() && !set->getEnabled()) {
-            set->setEnabledInMemory(true);
-            changed = true;
-        }
-        if (changed) {
-            saveData.append(
-                {set->getShortName(), static_cast<unsigned int>(set->getSortKey()), true, set->getIsKnown()});
-        }
-    }
-
-    if (!saveData.isEmpty()) {
-        controller->saveSets(saveData);
     }
 }
 
-void CardSetList::enableAllBatched(ICardSetPriorityController *controller)
+void CardSetList::enableAll()
+{
+    for (int i = 0; i < size(); ++i) {
+        CardSetPtr set = at(i);
+
+        if (set == nullptr) {
+            // qCWarning(CardInfoLog) << "enabledAll has null";
+            continue;
+        }
+
+        if (!set->getIsKnownIgnored()) {
+            set->setIsKnown(true);
+        }
+
+        set->setEnabled(true);
+    }
+}
+
+void CardSetList::markAllAsKnown()
+{
+    for (int i = 0; i < size(); ++i) {
+        CardSetPtr set = at(i);
+        if (set && !set->getIsKnown() && !set->getIsKnownIgnored()) {
+            set->setIsKnown(true);
+            set->setEnabled(false);
+        } else if (set && set->getIsKnownIgnored() && !set->getEnabled()) {
+            set->setEnabled(true);
+        }
+    }
+}
+
+void CardSetList::guessSortKeys()
 {
     defaultSort();
-
-    QVector<ICardSetPriorityController::SetSaveData> saveData;
-    saveData.reserve(size());
     for (int i = 0; i < size(); ++i) {
         CardSetPtr set = at(i);
         if (set.isNull()) {
+            // qCWarning(CardInfoLog) << "guessSortKeys set is null";
             continue;
         }
-
-        const auto sortKey = static_cast<unsigned int>(i);
-        set->setSortKeyInMemory(sortKey);
-        if (!set->getIsKnownIgnored()) {
-            set->setIsKnownInMemory(true);
-        }
-        set->setEnabledInMemory(true);
-        saveData.append({set->getShortName(), sortKey, true, set->getIsKnown()});
-    }
-
-    if (!saveData.isEmpty()) {
-        controller->saveSets(saveData);
-    }
-}
-
-void CardSetList::markAllAsKnownBatched(ICardSetPriorityController *controller)
-{
-    QVector<ICardSetPriorityController::SetSaveData> saveData;
-    for (int i = 0; i < size(); ++i) {
-        CardSetPtr set = at(i);
-        if (set.isNull()) {
-            continue;
-        }
-
-        bool changed = false;
-        if (!set->getIsKnown() && !set->getIsKnownIgnored()) {
-            set->setIsKnownInMemory(true);
-            set->setEnabledInMemory(false);
-            changed = true;
-        } else if (set->getIsKnownIgnored() && !set->getEnabled()) {
-            set->setEnabledInMemory(true);
-            changed = true;
-        }
-        if (changed) {
-            saveData.append({set->getShortName(), static_cast<unsigned int>(set->getSortKey()), set->getEnabled(),
-                             set->getIsKnown()});
-        }
-    }
-
-    if (!saveData.isEmpty()) {
-        controller->saveSets(saveData);
+        set->setSortKey(i);
     }
 }
 
diff --git a/libcockatrice_card/libcockatrice/card/set/card_set_list.h b/libcockatrice_card/libcockatrice/card/set/card_set_list.h
index f31710b33..81d605374 100644
--- a/libcockatrice_card/libcockatrice/card/set/card_set_list.h
+++ b/libcockatrice_card/libcockatrice/card/set/card_set_list.h
@@ -4,8 +4,6 @@
 #include "card_set.h"
 
 #include <QList>
-#include <QSharedPointer>
-#include <QStringList>
 
 /**
  * @class CardSetList
@@ -40,37 +38,36 @@ public:
     void sortByKey();
 
     /**
-     * @brief Enables every set with fresh sort keys, persisting in one flush.
+     * @brief Reassigns sort keys based on the current order.
      *
-     * Assigns sequential sort keys in default-sorted order and marks every set
-     * known and enabled, writing all records through the controller's batched
-     * saveSets() in a single settings flush instead of ~3 QSettings rewrite
-     * cycles per set, which froze the GUI thread for seconds on a first run
-     * with a full database.
-     * @param controller The set priority controller to persist the records with.
+     * Calls defaultSort() and then assigns sequential sort keys
+     * to all sets according to their resulting positions, replacing
+     * any existing sort keys to ensure consistent ordering.
      */
-    void enableAllBatched(ICardSetPriorityController *controller);
+    void guessSortKeys();
 
     /**
-     * @brief Enables all sets that are unknown or ignored, persisting in one flush.
+     * @brief Enables all sets that are unknown or ignored.
      *
      * Sets that are not marked as known and not ignored are marked as known
      * and enabled. Ignored-known sets are also enabled, but remain ignored.
-     * Only changed sets are written, so the common case of a few new sets costs
-     * a single settings flush no matter how large the database is.
-     * @param controller The set priority controller to persist the records with.
      */
-    void enableAllUnknownBatched(ICardSetPriorityController *controller);
+    void enableAllUnknown();
 
     /**
-     * @brief Marks all sets as known and adjusts their enabled state, persisting in one flush.
+     * @brief Enables all sets in the list.
+     *
+     * Equivalent to calling `setEnabled(true)` on each entry.
+     */
+    void enableAll();
+
+    /**
+     * @brief Marks all sets as known and adjusts their enabled state.
      *
      * Unknown, non-ignored sets become known and disabled.
      * Ignored-known sets are enabled if they were previously disabled.
-     * Only changed sets are written; when nothing is unknown no flush happens at all.
-     * @param controller The set priority controller to persist the records with.
      */
-    void markAllAsKnownBatched(ICardSetPriorityController *controller);
+    void markAllAsKnown();
 
     /**
      * @brief Counts the number of sets that are currently enabled.
diff --git a/libcockatrice_deck_list/CMakeLists.txt b/libcockatrice_deck_list/CMakeLists.txt
index e61a5702c..0c487466c 100644
--- a/libcockatrice_deck_list/CMakeLists.txt
+++ b/libcockatrice_deck_list/CMakeLists.txt
@@ -41,5 +41,3 @@ target_link_libraries(
   libcockatrice_deck_list PUBLIC libcockatrice_interfaces libcockatrice_protocol libcockatrice_utility
                                  ${QT_CORE_MODULE}
 )
-
-target_precompile_headers(libcockatrice_deck_list PRIVATE "${CMAKE_SOURCE_DIR}/cmake/pch/qtcore_pch.h")
diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.cpp b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.cpp
index 821b53dff..90f63c09d 100644
--- a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.cpp
+++ b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.cpp
@@ -2,26 +2,16 @@
 
 #include "deck_list_memento.h"
 #include "deck_list_plain_text_parser.h"
-#include "libcockatrice/deck_list/deck_list_node_tree.h"
-#include "libcockatrice/deck_list/sideboard_plan.h"
-#include "libcockatrice/utility/playmat_params.h"
+#include "tree/abstract_deck_list_node.h"
 #include "tree/deck_list_card_node.h"
 #include "tree/inner_deck_list_node.h"
 
-#include <QAnyStringView>
+#include <QCryptographicHash>
 #include <QDebug>
+#include <QFile>
 #include <QSet>
-#include <QSharedPointer>
-#include <QStringView>
 #include <QTextStream>
-#include <QXmlStreamAttributes>
-#include <QXmlStreamReader>
-#include <QXmlStreamWriter>
-#include <QtGlobal>
 #include <algorithm>
-#include <iterator>
-#include <libcockatrice/utility/card_ref.h>
-#include <qlogging.h>
 
 static const QString CURRENT_SIDEBOARD_PLAN_KEY = "";
 
diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.h b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.h
index 6796e9c33..199d3a9a8 100644
--- a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.h
+++ b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.h
@@ -12,24 +12,20 @@
 
 #include "deck_list_memento.h"
 #include "deck_list_node_tree.h"
-#include "libcockatrice/protocol/pb/move_card_to_zone.pb.h"
-#include "libcockatrice/utility/card_ref.h"
 #include "sideboard_plan.h"
 #include "tree/inner_deck_list_node.h"
 
-#include <QList>
 #include <QMap>
-#include <QSet>
-#include <QString>
-#include <QStringList>
-#include <functional>
+#include <QVector>
+#include <QtCore/QXmlStreamReader>
 #include <libcockatrice/utility/playmat_params.h>
 
+class AbstractDecklistNode;
 class DecklistCardNode;
+class CardDatabase;
 class QIODevice;
 class QTextStream;
-class QXmlStreamReader;
-class QXmlStreamWriter;
+class InnerDecklistNode;
 
 /**
  * @class DeckList
diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_history_manager.cpp b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_history_manager.cpp
index cba926fd5..b6d0687b4 100644
--- a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_history_manager.cpp
+++ b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_history_manager.cpp
@@ -1,10 +1,5 @@
 #include "deck_list_history_manager.h"
 
-#include "libcockatrice/deck_list/deck_list.h"
-#include "libcockatrice/deck_list/deck_list_memento.h"
-
-#include <QString>
-
 void DeckListHistoryManager::save(const DeckListMemento &memento)
 {
     undoStack.push(memento);
diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_history_manager.h b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_history_manager.h
index dce9e0af8..6acdb199e 100644
--- a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_history_manager.h
+++ b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_history_manager.h
@@ -1,13 +1,11 @@
 #ifndef COCKATRICE_DECK_LIST_HISTORY_MANAGER_H
 #define COCKATRICE_DECK_LIST_HISTORY_MANAGER_H
 
+#include "deck_list.h"
 #include "deck_list_memento.h"
 
 #include <QObject>
 #include <QStack>
-#include <qtmetamacros.h>
-
-class DeckList;
 
 class DeckListHistoryManager : public QObject
 {
diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_node_tree.cpp b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_node_tree.cpp
index 5c26030bf..66f228d19 100644
--- a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_node_tree.cpp
+++ b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_node_tree.cpp
@@ -1,19 +1,9 @@
 #include "deck_list_node_tree.h"
 
-#include "libcockatrice/deck_list/tree/abstract_deck_list_node.h"
-#include "libcockatrice/deck_list/tree/inner_deck_list_node.h"
 #include "tree/deck_list_card_node.h"
 
-#include <QByteArray>
-#include <QChar>
 #include <QCryptographicHash>
 #include <QSet>
-#include <QSharedPointer>
-#include <QStringList>
-#include <QStringView>
-#include <QXmlStreamAttributes>
-#include <QXmlStreamReader>
-#include <QtGlobal>
 
 static constexpr int MAX_DECK_SIZE = 1e5;
 
diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_node_tree.h b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_node_tree.h
index 08b4b0d73..2c66b34ff 100644
--- a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_node_tree.h
+++ b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_node_tree.h
@@ -1,17 +1,11 @@
 #ifndef COCKATRICE_DECKLIST_NODE_TREE_H
 #define COCKATRICE_DECKLIST_NODE_TREE_H
 
+#include "libcockatrice/utility/card_ref.h"
 #include "tree/deck_list_card_node.h"
 #include "tree/inner_deck_list_node.h"
 
-#include <QList>
 #include <QSet>
-#include <QString>
-#include <functional>
-
-class AbstractDecklistNode;
-class QXmlStreamReader;
-class QXmlStreamWriter;
 
 class DecklistNodeTree
 {
diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_plain_text_parser.cpp b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_plain_text_parser.cpp
index fb6a61769..de50d743b 100644
--- a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_plain_text_parser.cpp
+++ b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_plain_text_parser.cpp
@@ -1,17 +1,10 @@
 #include "deck_list_plain_text_parser.h"
 
 #include "deck_list_node_tree.h"
-#include "libcockatrice/deck_list/deck_list.h"
 #include "tree/inner_deck_list_node.h"
 
-#include <QChar>
-#include <QList>
 #include <QRegularExpression>
-#include <QRegularExpressionMatch>
-#include <QString>
 #include <QTextStream>
-#include <QtGlobal>
-#include <qnamespace.h>
 
 namespace DeckListPlainText
 {
@@ -33,7 +26,6 @@ bool parse(QTextStream &in,
 
     // Regex for advanced card parsing
     static const QRegularExpression reMultiplier(R"(^[xX\(\[]*(\d+)[xX\*\)\]]* ?(.+))");
-    static const QRegularExpression reTabQuantity(R"(^\d+[xX]?$)");
 
     // Regex for extracting set code and collector number with attached symbols
     static const QRegularExpression reHyphenFormat(R"(\((\w{3,})\)\s+(\w{3,})-(\d+[^\w\s]*))");
@@ -111,34 +103,8 @@ bool parse(QTextStream &in,
             continue;
         }
 
-        const QString rawLine = match.captured();
-        QString cardName = rawLine.simplified();
+        QString cardName = match.captured().simplified();
         bool sideboard = false;
-        int amount = 1;
-
-        // Card names never contain tab characters, so a leading numeric field
-        // marks a tabular record emitted by third-party deck tools (e.g. Delver
-        // Lens "2\tCard Name\tSet Name"). The first two columns are the quantity
-        // and the card name; any further columns are printer/set metadata and
-        // are discarded.
-        bool hasTabQuantity = false;
-        const auto tabFields = rawLine.split('\t');
-        int firstField = 0;
-        while (firstField < tabFields.size() && tabFields.at(firstField).trimmed().isEmpty()) {
-            ++firstField;
-        }
-        if (firstField + 1 < tabFields.size()) {
-            const QString quantity = tabFields.at(firstField).trimmed();
-            if (reTabQuantity.match(quantity).hasMatch()) {
-                hasTabQuantity = true;
-                QString digits = quantity;
-                if (digits.endsWith('x') || digits.endsWith('X')) {
-                    digits.chop(1);
-                }
-                amount = digits.toInt();
-                cardName = tabFields.at(firstField + 1).simplified();
-            }
-        }
 
         // Sideboard detection
         if (sBStart < 0) {
@@ -183,12 +149,11 @@ bool parse(QTextStream &in,
         }
 
         // check if a specific amount is mentioned
-        if (!hasTabQuantity) {
-            match = reMultiplier.match(cardName);
-            if (match.hasMatch()) {
-                amount = match.captured(1).toInt();
-                cardName = match.captured(2);
-            }
+        int amount = 1;
+        match = reMultiplier.match(cardName);
+        if (match.hasMatch()) {
+            amount = match.captured(1).toInt();
+            cardName = match.captured(2);
         }
 
         // Normalize the card name
diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_plain_text_parser.h b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_plain_text_parser.h
index 0845f7935..e0f456a18 100644
--- a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_plain_text_parser.h
+++ b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_plain_text_parser.h
@@ -3,11 +3,10 @@
 
 #include "deck_list.h"
 
+#include <QString>
 #include <functional>
 
 class QTextStream;
-class DecklistNodeTree;
-class QString;
 
 namespace DeckListPlainText
 {
diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/playmat_resolver.cpp b/libcockatrice_deck_list/libcockatrice/deck_list/playmat_resolver.cpp
index d1d44cca5..fd72fea0b 100644
--- a/libcockatrice_deck_list/libcockatrice/deck_list/playmat_resolver.cpp
+++ b/libcockatrice_deck_list/libcockatrice/deck_list/playmat_resolver.cpp
@@ -1,12 +1,6 @@
 #include "playmat_resolver.h"
 
-#include "libcockatrice/deck_list/deck_list.h"
-#include "libcockatrice/interfaces/interface_interface_settings_provider.h"
-#include "libcockatrice/utility/card_ref.h"
-
-#include <QList>
 #include <QRandomGenerator>
-#include <QString>
 
 PlaymatInfo resolveEffectivePlaymat(const DeckList &deck,
                                     const PlaymatInfo &force,
diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/playmat_resolver.h b/libcockatrice_deck_list/libcockatrice/deck_list/playmat_resolver.h
index 411ca81fd..59bc449c8 100644
--- a/libcockatrice_deck_list/libcockatrice/deck_list/playmat_resolver.h
+++ b/libcockatrice_deck_list/libcockatrice/deck_list/playmat_resolver.h
@@ -1,13 +1,10 @@
 #ifndef COCKATRICE_PLAYMAT_RESOLVER_H
 #define COCKATRICE_PLAYMAT_RESOLVER_H
 
-#include "libcockatrice/utility/playmat_params.h"
+#include "deck_list.h"
 
 #include <libcockatrice/interfaces/interface_interface_settings_provider.h>
 
-class DeckList;
-template <typename T> class QList;
-
 /**
  * @brief Resolves the effective playmat for a deck per the resolution chain:
  *        force override > deck-configured playmat > fallback list > none.
diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/sideboard_plan.cpp b/libcockatrice_deck_list/libcockatrice/deck_list/sideboard_plan.cpp
index 3a47bf1a5..855062c18 100644
--- a/libcockatrice_deck_list/libcockatrice/deck_list/sideboard_plan.cpp
+++ b/libcockatrice_deck_list/libcockatrice/deck_list/sideboard_plan.cpp
@@ -1,12 +1,6 @@
 #include "sideboard_plan.h"
 
-#include "libcockatrice/protocol/pb/move_card_to_zone.pb.h"
-
-#include <QSharedPointer>
-#include <QStringView>
 #include <QXmlStreamReader>
-#include <QXmlStreamWriter>
-#include <string>
 
 namespace
 {
diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/sideboard_plan.h b/libcockatrice_deck_list/libcockatrice/deck_list/sideboard_plan.h
index ee29991d6..fff4ff2f3 100644
--- a/libcockatrice_deck_list/libcockatrice/deck_list/sideboard_plan.h
+++ b/libcockatrice_deck_list/libcockatrice/deck_list/sideboard_plan.h
@@ -2,7 +2,6 @@
 #define COCKATRICE_SIDEBOARD_PLAN_H
 
 #include <QList>
-#include <QString>
 #include <libcockatrice/protocol/pb/move_card_to_zone.pb.h>
 
 class QXmlStreamWriter;
diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/tree/abstract_deck_list_card_node.cpp b/libcockatrice_deck_list/libcockatrice/deck_list/tree/abstract_deck_list_card_node.cpp
index 5c7b4bf84..685238d53 100644
--- a/libcockatrice_deck_list/libcockatrice/deck_list/tree/abstract_deck_list_card_node.cpp
+++ b/libcockatrice_deck_list/libcockatrice/deck_list/tree/abstract_deck_list_card_node.cpp
@@ -1,10 +1,5 @@
 #include "abstract_deck_list_card_node.h"
 
-#include "libcockatrice/deck_list/tree/abstract_deck_list_node.h"
-
-#include <QXmlStreamWriter>
-#include <compare>
-
 bool AbstractDecklistCardNode::compare(AbstractDecklistNode *other) const
 {
     switch (sortMethod) {
diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/tree/abstract_deck_list_card_node.h b/libcockatrice_deck_list/libcockatrice/deck_list/tree/abstract_deck_list_card_node.h
index ebfd9a0b6..0942a4601 100644
--- a/libcockatrice_deck_list/libcockatrice/deck_list/tree/abstract_deck_list_card_node.h
+++ b/libcockatrice_deck_list/libcockatrice/deck_list/tree/abstract_deck_list_card_node.h
@@ -13,10 +13,6 @@
 
 #include "abstract_deck_list_node.h"
 
-#include <QString>
-
-class InnerDecklistNode;
-
 /**
  * @class AbstractDecklistCardNode
  * @ingroup DeckModels
diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/tree/abstract_deck_list_node.h b/libcockatrice_deck_list/libcockatrice/deck_list/tree/abstract_deck_list_node.h
index 406c6fb4d..38d1d44b8 100644
--- a/libcockatrice_deck_list/libcockatrice/deck_list/tree/abstract_deck_list_node.h
+++ b/libcockatrice_deck_list/libcockatrice/deck_list/tree/abstract_deck_list_node.h
@@ -17,9 +17,7 @@
 #ifndef COCKATRICE_ABSTRACT_DECK_LIST_NODE_H
 #define COCKATRICE_ABSTRACT_DECK_LIST_NODE_H
 
-#include <QString>
-
-class QXmlStreamWriter;
+#include <QtCore/QXmlStreamWriter>
 
 /**
  * @enum DeckSortMethod
diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/tree/deck_list_card_node.cpp b/libcockatrice_deck_list/libcockatrice/deck_list/tree/deck_list_card_node.cpp
index 803737f1e..1791c09a6 100644
--- a/libcockatrice_deck_list/libcockatrice/deck_list/tree/deck_list_card_node.cpp
+++ b/libcockatrice_deck_list/libcockatrice/deck_list/tree/deck_list_card_node.cpp
@@ -1,9 +1,5 @@
 #include "deck_list_card_node.h"
 
-#include "libcockatrice/deck_list/tree/abstract_deck_list_card_node.h"
-
-class InnerDecklistNode;
-
 DecklistCardNode::DecklistCardNode(DecklistCardNode *other, InnerDecklistNode *_parent)
     : AbstractDecklistCardNode(_parent), name(other->getName()), number(other->getNumber()),
       cardSetShortName(other->getCardSetShortName()), cardSetNumber(other->getCardCollectorNumber()),
diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/tree/deck_list_card_node.h b/libcockatrice_deck_list/libcockatrice/deck_list/tree/deck_list_card_node.h
index c96a764af..3bab5405a 100644
--- a/libcockatrice_deck_list/libcockatrice/deck_list/tree/deck_list_card_node.h
+++ b/libcockatrice_deck_list/libcockatrice/deck_list/tree/deck_list_card_node.h
@@ -14,11 +14,7 @@
 
 #include "abstract_deck_list_card_node.h"
 
-#include <QString>
 #include <libcockatrice/utility/card_ref.h>
-#include <utility>
-
-class InnerDecklistNode;
 
 /**
  * @class DecklistCardNode
diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp b/libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp
index b7b1e0b8f..86f7f5363 100644
--- a/libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp
+++ b/libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp
@@ -1,18 +1,6 @@
 #include "inner_deck_list_node.h"
 
 #include "deck_list_card_node.h"
-#include "libcockatrice/deck_list/tree/abstract_deck_list_card_node.h"
-#include "libcockatrice/deck_list/tree/abstract_deck_list_node.h"
-
-#include <QObject>
-#include <QSharedPointer>
-#include <QStringView>
-#include <QXmlStreamAttributes>
-#include <QXmlStreamReader>
-#include <QXmlStreamWriter>
-#include <QtGlobal>
-#include <algorithm>
-#include <compare>
 
 InnerDecklistNode::InnerDecklistNode(InnerDecklistNode *other, InnerDecklistNode *_parent)
     : AbstractDecklistNode(_parent), name(other->getName())
diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.h b/libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.h
index 6086f9efa..8404d7116 100644
--- a/libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.h
+++ b/libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.h
@@ -19,13 +19,7 @@
 #include "abstract_deck_list_node.h"
 
 #include <QList>
-#include <QPair>
 #include <QString>
-#include <QVector>
-#include <qnamespace.h>
-#include <utility>
-
-class QXmlStreamReader;
 
 /** @brief Constant for the "main" deck zone name. */
 #define DECK_ZONE_MAIN "main"
diff --git a/libcockatrice_filters/CMakeLists.txt b/libcockatrice_filters/CMakeLists.txt
index 2d45b8e5b..905533df8 100644
--- a/libcockatrice_filters/CMakeLists.txt
+++ b/libcockatrice_filters/CMakeLists.txt
@@ -18,5 +18,3 @@ add_dependencies(libcockatrice_filters libcockatrice_card)
 target_include_directories(libcockatrice_filters PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
 target_link_libraries(libcockatrice_filters PUBLIC libcockatrice_card ${QT_CORE_MODULE})
-
-target_precompile_headers(libcockatrice_filters PRIVATE "${CMAKE_SOURCE_DIR}/cmake/pch/qtcore_pch.h")
diff --git a/libcockatrice_filters/libcockatrice/filters/filter_card.cpp b/libcockatrice_filters/libcockatrice/filters/filter_card.cpp
index 26cddd53c..5fdce7ae0 100644
--- a/libcockatrice_filters/libcockatrice/filters/filter_card.cpp
+++ b/libcockatrice_filters/libcockatrice/filters/filter_card.cpp
@@ -1,9 +1,6 @@
 #include "filter_card.h"
 
 #include <QJsonObject>
-#include <QJsonValue>
-#include <QJsonValueRef>
-#include <QSharedPointer>
 
 QJsonObject CardFilter::toJson() const
 {
diff --git a/libcockatrice_filters/libcockatrice/filters/filter_card.h b/libcockatrice_filters/libcockatrice/filters/filter_card.h
index e6a37ee40..bb1e0ef53 100644
--- a/libcockatrice_filters/libcockatrice/filters/filter_card.h
+++ b/libcockatrice_filters/libcockatrice/filters/filter_card.h
@@ -7,10 +7,8 @@
 #ifndef CARDFILTER_H
 #define CARDFILTER_H
 
-#include <QJsonObject>
 #include <QObject>
 #include <QString>
-#include <qtmetamacros.h>
 
 class CardFilter : public QObject
 {
diff --git a/libcockatrice_filters/libcockatrice/filters/filter_string.cpp b/libcockatrice_filters/libcockatrice/filters/filter_string.cpp
index bc137b0f6..df0c70ae7 100644
--- a/libcockatrice_filters/libcockatrice/filters/filter_string.cpp
+++ b/libcockatrice_filters/libcockatrice/filters/filter_string.cpp
@@ -1,35 +1,12 @@
 #include "filter_string.h"
 
-#include "libcockatrice/card/card_info.h"
-#include "libcockatrice/card/card_localization.h"
-#include "libcockatrice/card/database/card_database.h"
-#include "libcockatrice/card/printing/printing_info.h"
-#include "libcockatrice/card/set/card_set.h"
-#include "libcockatrice/card/set/card_set_list.h"
-
 #include <QByteArray>
-#include <QChar>
-#include <QDate>
 #include <QDebug>
-#include <QList>
-#include <QMessageLogger>
 #include <QRegularExpression>
-#include <QRegularExpressionMatch>
-#include <QSharedPointer>
 #include <QString>
-#include <QStringList>
-#include <algorithm>
-#include <any>
-#include <ctype.h>
 #include <functional>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/utility/peglib.h>
-#include <mutex>
-#include <qnamespace.h>
-#include <stddef.h>
-#include <string>
-#include <string_view>
-#include <vector>
 
 static peg::parser search(R"(
 Start <- QueryPartList
diff --git a/libcockatrice_filters/libcockatrice/filters/filter_string.h b/libcockatrice_filters/libcockatrice/filters/filter_string.h
index 2abe95201..015df0cf4 100644
--- a/libcockatrice_filters/libcockatrice/filters/filter_string.h
+++ b/libcockatrice_filters/libcockatrice/filters/filter_string.h
@@ -7,13 +7,15 @@
 #ifndef FILTER_STRING_H
 #define FILTER_STRING_H
 
+#include "filter_tree.h"
+
 #include <QLoggingCategory>
+#include <QMap>
 #include <QString>
 #include <functional>
 #include <libcockatrice/card/card_info.h>
 #include <libcockatrice/card/card_localization.h>
-
-struct CardSearchLanguage;
+#include <utility>
 
 inline Q_LOGGING_CATEGORY(FilterStringLog, "filter_string");
 
@@ -27,7 +29,6 @@ namespace peg
 {
 template <typename Annotation> struct AstBase;
 struct EmptyType;
-
 typedef AstBase<EmptyType> Ast;
 } // namespace peg
 
diff --git a/libcockatrice_filters/libcockatrice/filters/filter_tree.cpp b/libcockatrice_filters/libcockatrice/filters/filter_tree.cpp
index 742b44e97..a5d91d9d3 100644
--- a/libcockatrice_filters/libcockatrice/filters/filter_tree.cpp
+++ b/libcockatrice_filters/libcockatrice/filters/filter_tree.cpp
@@ -1,16 +1,8 @@
 #include "filter_tree.h"
 
 #include "filter_card.h"
-#include "libcockatrice/card/card_localization.h"
-#include "libcockatrice/card/printing/printing_info.h"
-#include "libcockatrice/card/set/card_set.h"
 
-#include <QChar>
 #include <QList>
-#include <QSharedPointer>
-#include <QStringList>
-#include <algorithm>
-#include <qnamespace.h>
 
 template <class T> FilterTreeNode *FilterTreeBranch<T>::nodeAt(int i) const
 {
diff --git a/libcockatrice_filters/libcockatrice/filters/filter_tree.h b/libcockatrice_filters/libcockatrice/filters/filter_tree.h
index 0defd466b..dd47a1ebc 100644
--- a/libcockatrice_filters/libcockatrice/filters/filter_tree.h
+++ b/libcockatrice_filters/libcockatrice/filters/filter_tree.h
@@ -8,16 +8,13 @@
 #define FILTERTREE_H
 
 #include "filter_card.h"
-#include "libcockatrice/card/card_info.h"
 
 #include <QList>
 #include <QObject>
-#include <QString>
-#include <qtmetamacros.h>
+#include <libcockatrice/card/card_localization.h>
+#include <libcockatrice/card/database/card_database.h>
 #include <utility>
 
-struct CardSearchLanguage;
-
 class FilterTreeNode
 {
 private:
@@ -123,7 +120,6 @@ public:
 
 class FilterItemList;
 class FilterTree;
-
 class LogicMap : public FilterTreeBranch<FilterItemList *>
 {
 
@@ -146,7 +142,6 @@ public:
 };
 
 class FilterItem;
-
 class FilterItemList : public FilterTreeBranch<FilterItem *>
 {
 private:
diff --git a/libcockatrice_interfaces/CMakeLists.txt b/libcockatrice_interfaces/CMakeLists.txt
index 3b17569b1..f53c41807 100644
--- a/libcockatrice_interfaces/CMakeLists.txt
+++ b/libcockatrice_interfaces/CMakeLists.txt
@@ -31,5 +31,3 @@ add_library(libcockatrice_interfaces STATIC ${MOC_SOURCES})
 target_include_directories(libcockatrice_interfaces PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
 target_link_libraries(libcockatrice_interfaces PUBLIC libcockatrice_utility ${QT_CORE_MODULE})
-
-target_precompile_headers(libcockatrice_interfaces PRIVATE "${CMAKE_SOURCE_DIR}/cmake/pch/qtcore_pch.h")
diff --git a/libcockatrice_interfaces/libcockatrice/interfaces/interface_card_preference_provider.h b/libcockatrice_interfaces/libcockatrice/interfaces/interface_card_preference_provider.h
index 2510919ca..a6cf941fb 100644
--- a/libcockatrice_interfaces/libcockatrice/interfaces/interface_card_preference_provider.h
+++ b/libcockatrice_interfaces/libcockatrice/interfaces/interface_card_preference_provider.h
@@ -8,6 +8,7 @@ class ICardPreferenceProvider
 public:
     virtual ~ICardPreferenceProvider() = default;
     [[nodiscard]] virtual QString getCardPreferenceOverride(const QString &cardName) const = 0;
+    [[nodiscard]] virtual bool getIncludeRebalancedCards() const = 0;
 };
 
 #endif // COCKATRICE_INTERFACE_CARD_PREFERENCE_PROVIDER_H
diff --git a/libcockatrice_interfaces/libcockatrice/interfaces/interface_card_set_priority_controller.h b/libcockatrice_interfaces/libcockatrice/interfaces/interface_card_set_priority_controller.h
index 746ac9490..36e748006 100644
--- a/libcockatrice_interfaces/libcockatrice/interfaces/interface_card_set_priority_controller.h
+++ b/libcockatrice_interfaces/libcockatrice/interfaces/interface_card_set_priority_controller.h
@@ -2,7 +2,6 @@
 #define COCKATRICE_INTERFACE_CARD_SET_PRIORITY_CONTROLLER_H
 
 #include <QString>
-#include <QStringList>
 
 class ICardSetPriorityController
 {
@@ -12,7 +11,6 @@ public:
         QString shortName;
         unsigned int sortKey;
         bool enabled;
-        bool isKnown = false;
     };
 
     /**
@@ -48,24 +46,6 @@ public:
      */
     virtual SetOptions getSetOptions(QString shortName) const = 0;
 
-    /**
-     * @brief Returns the short names of every set currently marked as enabled.
-     *
-     * Callers fold this into the card database cache source hash so that
-     * toggling set enablement invalidates the cache.
-     *
-     * @return The enabled set short names, sorted alphabetically.
-     */
-    virtual QStringList getEnabledSetNames() const = 0;
-
-    /**
-     * @brief Persists per-set options for every entry in a single settings flush.
-     *
-     * Each individual setSortKey/setEnabled/setIsKnown call re-opens and re-syncs
-     * the whole .ini when backed by QSettings, so persisting hundreds of sets
-     * one option at a time freezes the GUI thread for seconds. Callers that touch
-     * more than a handful of sets must bundle the records and call this once.
-     */
     virtual void saveSets(const QVector<SetSaveData> &data) = 0;
 };
 
diff --git a/libcockatrice_interfaces/libcockatrice/interfaces/interface_cards_display_settings_provider.h b/libcockatrice_interfaces/libcockatrice/interfaces/interface_cards_display_settings_provider.h
index a5ab4fc37..2821fb96e 100644
--- a/libcockatrice_interfaces/libcockatrice/interfaces/interface_cards_display_settings_provider.h
+++ b/libcockatrice_interfaces/libcockatrice/interfaces/interface_cards_display_settings_provider.h
@@ -14,6 +14,7 @@ public:
     [[nodiscard]] virtual bool getBumpSetsWithCardsInDeckToTop() const = 0;
     [[nodiscard]] virtual int getPrintingSelectorSortOrder() const = 0;
     [[nodiscard]] virtual int getPrintingSelectorCardSize() const = 0;
+    [[nodiscard]] virtual bool getIncludeRebalancedCards() const = 0;
     [[nodiscard]] virtual bool getPrintingSelectorNavigationButtonsVisible() const = 0;
     [[nodiscard]] virtual bool getTapAnimation() const = 0;
     [[nodiscard]] virtual bool getArrowDrawAnimation() const = 0;
diff --git a/libcockatrice_interfaces/libcockatrice/interfaces/noop_card_preference_provider.h b/libcockatrice_interfaces/libcockatrice/interfaces/noop_card_preference_provider.h
index f846d51e8..3781f4b63 100644
--- a/libcockatrice_interfaces/libcockatrice/interfaces/noop_card_preference_provider.h
+++ b/libcockatrice_interfaces/libcockatrice/interfaces/noop_card_preference_provider.h
@@ -9,6 +9,11 @@ public:
     {
         return {};
     }
+
+    [[nodiscard]] bool getIncludeRebalancedCards() const override
+    {
+        return true;
+    }
 };
 
 #endif // COCKATRICE_NOOP_CARD_PREFERENCE_PROVIDER_H
diff --git a/libcockatrice_interfaces/libcockatrice/interfaces/noop_card_set_priority_controller.h b/libcockatrice_interfaces/libcockatrice/interfaces/noop_card_set_priority_controller.h
index 94e1f0c9a..8cc2011bd 100644
--- a/libcockatrice_interfaces/libcockatrice/interfaces/noop_card_set_priority_controller.h
+++ b/libcockatrice_interfaces/libcockatrice/interfaces/noop_card_set_priority_controller.h
@@ -34,11 +34,6 @@ public:
         return {0, true, true};
     }
 
-    QStringList getEnabledSetNames() const override
-    {
-        return {};
-    }
-
     void saveSets(const QVector<SetSaveData> & /* data */) override
     {
     }
diff --git a/libcockatrice_models/libcockatrice/models/database/CMakeLists.txt b/libcockatrice_models/libcockatrice/models/database/CMakeLists.txt
index a73e36dbb..840f14b08 100644
--- a/libcockatrice_models/libcockatrice/models/database/CMakeLists.txt
+++ b/libcockatrice_models/libcockatrice/models/database/CMakeLists.txt
@@ -29,5 +29,3 @@ add_library(
 target_include_directories(libcockatrice_models_database PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
 target_link_libraries(libcockatrice_models_database PUBLIC libcockatrice_card libcockatrice_filters ${QT_CORE_MODULE})
-
-target_precompile_headers(libcockatrice_models_database PRIVATE "${CMAKE_SOURCE_DIR}/cmake/pch/qtcore_pch.h")
diff --git a/libcockatrice_models/libcockatrice/models/database/card/card_completer_proxy_model.cpp b/libcockatrice_models/libcockatrice/models/database/card/card_completer_proxy_model.cpp
index b99b8b0f7..f31463b50 100644
--- a/libcockatrice_models/libcockatrice/models/database/card/card_completer_proxy_model.cpp
+++ b/libcockatrice_models/libcockatrice/models/database/card/card_completer_proxy_model.cpp
@@ -1,14 +1,5 @@
 #include "card_completer_proxy_model.h"
 
-#include <QAbstractItemModel>
-#include <QModelIndex>
-#include <QRegularExpression>
-#include <QString>
-#include <QVariant>
-#include <qnamespace.h>
-
-class QObject;
-
 CardCompleterProxyModel::CardCompleterProxyModel(QObject *parent) : QSortFilterProxyModel(parent)
 {
 }
diff --git a/libcockatrice_models/libcockatrice/models/database/card/card_completer_proxy_model.h b/libcockatrice_models/libcockatrice/models/database/card/card_completer_proxy_model.h
index 8aa671af7..91dc06335 100644
--- a/libcockatrice_models/libcockatrice/models/database/card/card_completer_proxy_model.h
+++ b/libcockatrice_models/libcockatrice/models/database/card/card_completer_proxy_model.h
@@ -8,9 +8,6 @@
 #define CARD_COMPLETER_PROXY_MODEL_H
 
 #include <QSortFilterProxyModel>
-#include <qtmetamacros.h>
-
-class QObject;
 
 class CardCompleterProxyModel : public QSortFilterProxyModel
 {
diff --git a/libcockatrice_models/libcockatrice/models/database/card/card_search_model.cpp b/libcockatrice_models/libcockatrice/models/database/card/card_search_model.cpp
index 5bde6e3fc..3a734ed37 100644
--- a/libcockatrice_models/libcockatrice/models/database/card/card_search_model.cpp
+++ b/libcockatrice_models/libcockatrice/models/database/card/card_search_model.cpp
@@ -3,10 +3,6 @@
 #include "../card_database_display_model.h"
 #include "../card_database_model.h"
 
-#include <QAbstractItemModel>
-#include <QObject>
-#include <QVariant>
-#include <QtGlobal>
 #include <algorithm>
 #include <libcockatrice/utility/levenshtein.h>
 
diff --git a/libcockatrice_models/libcockatrice/models/database/card/card_search_model.h b/libcockatrice_models/libcockatrice/models/database/card/card_search_model.h
index 08d0e8636..b877a9385 100644
--- a/libcockatrice_models/libcockatrice/models/database/card/card_search_model.h
+++ b/libcockatrice_models/libcockatrice/models/database/card/card_search_model.h
@@ -7,20 +7,9 @@
 #ifndef CARD_SEARCH_MODEL_H
 #define CARD_SEARCH_MODEL_H
 
-#include "libcockatrice/card/card_info.h"
-#include "libcockatrice/card/card_localization.h"
+#include "../card_database_display_model.h"
 
 #include <QAbstractListModel>
-#include <QList>
-#include <QModelIndex>
-#include <QSharedPointer>
-#include <QString>
-#include <QStringList>
-#include <qnamespace.h>
-#include <qtmetamacros.h>
-
-class CardDatabaseDisplayModel;
-class QObject;
 
 class CardSearchModel : public QAbstractListModel
 {
diff --git a/libcockatrice_models/libcockatrice/models/database/card_database_display_model.cpp b/libcockatrice_models/libcockatrice/models/database/card_database_display_model.cpp
index 39bb8314c..7f89677c8 100644
--- a/libcockatrice_models/libcockatrice/models/database/card_database_display_model.cpp
+++ b/libcockatrice_models/libcockatrice/models/database/card_database_display_model.cpp
@@ -1,23 +1,6 @@
 #include "card_database_display_model.h"
 
 #include "card_database_model.h"
-#include "libcockatrice/card/card_localization.h"
-#include "libcockatrice/filters/filter_string.h"
-#include "libcockatrice/filters/filter_tree.h"
-
-#include <QAbstractItemModel>
-#include <QChar>
-#include <QList>
-#include <QMap>
-#include <QSharedPointer>
-#include <QStringList>
-#include <QVariant>
-#include <QtGlobal>
-#include <qnamespace.h>
-#include <string>
-#include <utility>
-
-class QObject;
 
 CardDatabaseDisplayModel::CardDatabaseDisplayModel(QObject *parent)
     : QSortFilterProxyModel(parent), isToken(ShowAll), filterString(nullptr)
diff --git a/libcockatrice_models/libcockatrice/models/database/card_database_display_model.h b/libcockatrice_models/libcockatrice/models/database/card_database_display_model.h
index d12dd1fb4..e6aadd8c6 100644
--- a/libcockatrice_models/libcockatrice/models/database/card_database_display_model.h
+++ b/libcockatrice_models/libcockatrice/models/database/card_database_display_model.h
@@ -8,21 +8,12 @@
 #ifndef COCKATRICE_CARD_DATABASE_DISPLAY_MODEL_H
 #define COCKATRICE_CARD_DATABASE_DISPLAY_MODEL_H
 
-#include "libcockatrice/card/card_info.h"
-
-#include <QModelIndex>
-#include <QSet>
 #include <QSortFilterProxyModel>
-#include <QString>
 #include <QTimer>
 #include <libcockatrice/card/card_localization.h>
 #include <libcockatrice/filters/filter_string.h>
-#include <qtmetamacros.h>
 
 class FilterTree;
-class QObject;
-template <class Key, class T> class QMap;
-
 class CardDatabaseDisplayModel : public QSortFilterProxyModel
 {
     Q_OBJECT
diff --git a/libcockatrice_models/libcockatrice/models/database/card_database_model.cpp b/libcockatrice_models/libcockatrice/models/database/card_database_model.cpp
index 1ede554f8..ecd26a9f8 100644
--- a/libcockatrice_models/libcockatrice/models/database/card_database_model.cpp
+++ b/libcockatrice_models/libcockatrice/models/database/card_database_model.cpp
@@ -1,16 +1,8 @@
 #include "card_database_model.h"
 
-#include "libcockatrice/card/printing/printing_info.h"
-#include "libcockatrice/card/set/card_set.h"
-
-#include <QChar>
-#include <QSharedPointer>
-#include <QString>
-#include <QVariant>
+#include <QMap>
 #include <libcockatrice/card/database/card_database.h>
 
-class QObject;
-
 #define CARDDBMODEL_COLUMNS 6
 
 CardDatabaseModel::CardDatabaseModel(CardDatabase *_db, bool _showOnlyCardsFromEnabledSets, QObject *parent)
diff --git a/libcockatrice_models/libcockatrice/models/database/card_database_model.h b/libcockatrice_models/libcockatrice/models/database/card_database_model.h
index 208240109..ad84de6f4 100644
--- a/libcockatrice_models/libcockatrice/models/database/card_database_model.h
+++ b/libcockatrice_models/libcockatrice/models/database/card_database_model.h
@@ -7,17 +7,10 @@
 #ifndef CARDDATABASEMODEL_H
 #define CARDDATABASEMODEL_H
 
-#include "libcockatrice/card/card_info.h"
-
 #include <QAbstractListModel>
 #include <QList>
-#include <QModelIndex>
 #include <QSet>
-#include <qnamespace.h>
-#include <qtmetamacros.h>
-
-class CardDatabase;
-class QObject;
+#include <libcockatrice/card/database/card_database.h>
 
 class CardDatabaseModel : public QAbstractListModel
 {
diff --git a/libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp b/libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp
index a0b9c1061..8fd5311f2 100644
--- a/libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp
+++ b/libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp
@@ -1,19 +1,6 @@
 #include "card_sets_model.h"
 
-#include "libcockatrice/card/database/card_database.h"
-#include "libcockatrice/card/set/card_set.h"
-#include "libcockatrice/interfaces/interface_card_set_priority_controller.h"
-
-#include <QAbstractItemModel>
-#include <QChar>
-#include <QDate>
-#include <QFlags>
-#include <QMultiMap>
-#include <QObject>
-#include <QSharedPointer>
 #include <QSortFilterProxyModel>
-#include <QVariant>
-#include <QVector>
 
 SetsModel::SetsModel(CardDatabase *_db, QObject *parent) : QAbstractTableModel(parent), sets(_db->getSetList())
 {
@@ -266,7 +253,7 @@ void SetsModel::save(CardDatabase *db)
         const bool enabled = enabledSets.contains(sets[i]);
         sets[i]->setSortKeyInMemory(sortKey);
         sets[i]->setEnabledInMemory(enabled);
-        saveData.append({sets[i]->getShortName(), sortKey, enabled, sets[i]->getIsKnown()});
+        saveData.append({sets[i]->getShortName(), sortKey, enabled});
     }
 
     db->getPriorityController()->saveSets(saveData);
diff --git a/libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.h b/libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.h
index 354414dc8..2adf71def 100644
--- a/libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.h
+++ b/libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.h
@@ -7,24 +7,13 @@
 #ifndef SETSMODEL_H
 #define SETSMODEL_H
 
-#include "libcockatrice/card/card_info.h"
-#include "libcockatrice/card/set/card_set_list.h"
-
 #include <QAbstractTableModel>
-#include <QList>
 #include <QMimeData>
-#include <QModelIndex>
-#include <QModelIndexList>
 #include <QSet>
 #include <QSortFilterProxyModel>
-#include <QString>
-#include <QStringList>
-#include <QtGlobal>
-#include <qnamespace.h>
-#include <qtmetamacros.h>
+#include <libcockatrice/card/database/card_database.h>
 
-class CardDatabase;
-class QObject;
+class SetsProxyModel;
 
 class SetsMimeData : public QMimeData
 {
diff --git a/libcockatrice_models/libcockatrice/models/database/token/token_display_model.cpp b/libcockatrice_models/libcockatrice/models/database/token/token_display_model.cpp
index e08183576..4282c6dc8 100644
--- a/libcockatrice_models/libcockatrice/models/database/token/token_display_model.cpp
+++ b/libcockatrice_models/libcockatrice/models/database/token/token_display_model.cpp
@@ -1,12 +1,6 @@
 #include "token_display_model.h"
 
 #include "../card_database_model.h"
-#include "card_database_display_model.h"
-#include "libcockatrice/card/card_info.h"
-
-#include <QSortFilterProxyModel>
-
-class QObject;
 
 TokenDisplayModel::TokenDisplayModel(QObject *parent) : CardDatabaseDisplayModel(parent)
 {
diff --git a/libcockatrice_models/libcockatrice/models/database/token/token_display_model.h b/libcockatrice_models/libcockatrice/models/database/token/token_display_model.h
index a8625368f..c8f767189 100644
--- a/libcockatrice_models/libcockatrice/models/database/token/token_display_model.h
+++ b/libcockatrice_models/libcockatrice/models/database/token/token_display_model.h
@@ -9,11 +9,6 @@
 
 #include "../card_database_display_model.h"
 
-#include <QModelIndex>
-#include <qtmetamacros.h>
-
-class QObject;
-
 class TokenDisplayModel : public CardDatabaseDisplayModel
 {
     Q_OBJECT
diff --git a/libcockatrice_models/libcockatrice/models/database/token/token_edit_model.cpp b/libcockatrice_models/libcockatrice/models/database/token/token_edit_model.cpp
index 9636ed665..89a1f71b1 100644
--- a/libcockatrice_models/libcockatrice/models/database/token/token_edit_model.cpp
+++ b/libcockatrice_models/libcockatrice/models/database/token/token_edit_model.cpp
@@ -2,13 +2,9 @@
 
 #include "../card_database_display_model.h"
 #include "../card_database_model.h"
-#include "libcockatrice/card/set/card_set.h"
 
-#include <QSortFilterProxyModel>
 #include <libcockatrice/card/card_info.h>
 
-class QObject;
-
 TokenEditModel::TokenEditModel(QObject *parent) : CardDatabaseDisplayModel(parent)
 {
 }
diff --git a/libcockatrice_models/libcockatrice/models/database/token/token_edit_model.h b/libcockatrice_models/libcockatrice/models/database/token/token_edit_model.h
index 2f3398899..92dfaadd7 100644
--- a/libcockatrice_models/libcockatrice/models/database/token/token_edit_model.h
+++ b/libcockatrice_models/libcockatrice/models/database/token/token_edit_model.h
@@ -9,11 +9,6 @@
 
 #include "../card_database_display_model.h"
 
-#include <QModelIndex>
-#include <qtmetamacros.h>
-
-class QObject;
-
 class TokenEditModel : public CardDatabaseDisplayModel
 {
     Q_OBJECT
diff --git a/libcockatrice_models/libcockatrice/models/deck_list/CMakeLists.txt b/libcockatrice_models/libcockatrice/models/deck_list/CMakeLists.txt
index 324bed102..a6ab2a204 100644
--- a/libcockatrice_models/libcockatrice/models/deck_list/CMakeLists.txt
+++ b/libcockatrice_models/libcockatrice/models/deck_list/CMakeLists.txt
@@ -16,5 +16,3 @@ target_include_directories(libcockatrice_models_deck_list PUBLIC ${CMAKE_CURRENT
 target_link_libraries(
   libcockatrice_models_deck_list PUBLIC libcockatrice_card libcockatrice_deck_list ${QT_CORE_MODULE}
 )
-
-target_precompile_headers(libcockatrice_models_deck_list PRIVATE "${CMAKE_SOURCE_DIR}/cmake/pch/qtcore_pch.h")
diff --git a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp b/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp
index 4b4088972..a5628a844 100644
--- a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp
+++ b/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp
@@ -1,27 +1,6 @@
 #include "deck_list_model.h"
 
-#include "deck_list_model_custom_zones.h"
-#include "libcockatrice/card/database/card_database_querier.h"
-#include "libcockatrice/card/format/format_legality_rules.h"
-#include "libcockatrice/card/printing/exact_card.h"
-#include "libcockatrice/card/printing/printing_info.h"
-#include "libcockatrice/card/set/card_set.h"
-#include "libcockatrice/deck_list/deck_list.h"
-#include "libcockatrice/deck_list/deck_list_node_tree.h"
-#include "libcockatrice/deck_list/tree/abstract_deck_list_node.h"
-#include "libcockatrice/deck_list/tree/deck_list_card_node.h"
-
-#include <QModelIndexList>
-#include <QSet>
-#include <QVariant>
-#include <algorithm>
-#include <compare>
-#include <iterator>
 #include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/utility/card_ref.h>
-#include <utility>
-
-class QObject;
 
 DeckListModel::DeckListModel(QObject *parent)
     : QAbstractItemModel(parent), lastKnownColumn(1), lastKnownOrder(Qt::AscendingOrder)
diff --git a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.h b/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.h
index 7334d48ef..ce6d7f8cb 100644
--- a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.h
+++ b/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.h
@@ -1,26 +1,18 @@
 #ifndef DECKLISTMODEL_H
 #define DECKLISTMODEL_H
 
-#include "libcockatrice/card/card_info.h"
-#include "libcockatrice/deck_list/tree/inner_deck_list_node.h"
-#include "libcockatrice/utility/card_ref.h"
+#include "deck_list_model_custom_zones.h"
 
 #include <../../../../libcockatrice_deck_list/libcockatrice/deck_list/tree/abstract_deck_list_card_node.h>
 #include <../../../../libcockatrice_deck_list/libcockatrice/deck_list/tree/deck_list_card_node.h>
 #include <QAbstractItemModel>
 #include <QList>
-#include <QModelIndex>
-#include <QSharedPointer>
-#include <QString>
-#include <QStringList>
-#include <functional>
-#include <qnamespace.h>
-#include <qtmetamacros.h>
+#include <libcockatrice/card/printing/exact_card.h>
+#include <libcockatrice/deck_list/deck_list.h>
 
-class AbstractDecklistNode;
-class DeckList;
-class ExactCard;
-class QObject;
+class CardDatabase;
+class QPrinter;
+class QTextCursor;
 
 /**
  * @namespace DeckRoles
diff --git a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model_custom_zones.cpp b/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model_custom_zones.cpp
index 419c38b04..1dc745e63 100644
--- a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model_custom_zones.cpp
+++ b/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model_custom_zones.cpp
@@ -1,14 +1,10 @@
 #include "deck_list_model_custom_zones.h"
 
 #include "deck_list_model.h"
-#include "libcockatrice/deck_list/tree/abstract_deck_list_node.h"
-#include "libcockatrice/deck_list/tree/inner_deck_list_node.h"
 
 #include <../../../../libcockatrice_deck_list/libcockatrice/deck_list/tree/deck_list_card_node.h>
 #include <QHash>
-#include <QSharedPointer>
 #include <QVector>
-#include <utility>
 
 namespace DeckListModelCustomZones
 {
diff --git a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model_custom_zones.h b/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model_custom_zones.h
index 53bdeaa1e..518a9e1d2 100644
--- a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model_custom_zones.h
+++ b/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model_custom_zones.h
@@ -4,10 +4,7 @@
 #include <../../../../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.h>
 #include <QList>
 #include <QPair>
-#include <QString>
-#include <qnamespace.h>
-
-class AbstractDecklistNode;
+#include <QtGlobal>
 
 /**
  * @class DecklistModelSubZoneNode
diff --git a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_sort_filter_proxy_model.cpp b/libcockatrice_models/libcockatrice/models/deck_list/deck_list_sort_filter_proxy_model.cpp
index dcb294ec8..3d433153a 100644
--- a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_sort_filter_proxy_model.cpp
+++ b/libcockatrice_models/libcockatrice/models/deck_list/deck_list_sort_filter_proxy_model.cpp
@@ -1,16 +1,6 @@
 #include "deck_list_sort_filter_proxy_model.h"
 
 #include "deck_list_model.h"
-#include "libcockatrice/card/card_info.h"
-#include "libcockatrice/card/database/card_database_manager.h"
-#include "libcockatrice/card/database/card_database_querier.h"
-#include "libcockatrice/card/printing/exact_card.h"
-
-#include <QAbstractItemModel>
-#include <QModelIndex>
-#include <QSharedPointer>
-#include <QVariant>
-#include <qnamespace.h>
 
 bool DeckListSortFilterProxyModel::lessThan(const QModelIndex &left, const QModelIndex &right) const
 {
diff --git a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_sort_filter_proxy_model.h b/libcockatrice_models/libcockatrice/models/deck_list/deck_list_sort_filter_proxy_model.h
index 522ed1e23..1565417f0 100644
--- a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_sort_filter_proxy_model.h
+++ b/libcockatrice_models/libcockatrice/models/deck_list/deck_list_sort_filter_proxy_model.h
@@ -7,13 +7,8 @@
 #ifndef COCKATRICE_DECK_LIST_SORT_FILTER_PROXY_MODEL_H
 #define COCKATRICE_DECK_LIST_SORT_FILTER_PROXY_MODEL_H
 
-#include <QList>
 #include <QSortFilterProxyModel>
-#include <QString>
-#include <QStringList>
-#include <qtmetamacros.h>
-
-class QObject;
+#include <libcockatrice/card/database/card_database_manager.h>
 
 class DeckListSortFilterProxyModel : public QSortFilterProxyModel
 {
diff --git a/libcockatrice_network/libcockatrice/network/client/abstract/CMakeLists.txt b/libcockatrice_network/libcockatrice/network/client/abstract/CMakeLists.txt
index 53ad524b4..6fba8d629 100644
--- a/libcockatrice_network/libcockatrice/network/client/abstract/CMakeLists.txt
+++ b/libcockatrice_network/libcockatrice/network/client/abstract/CMakeLists.txt
@@ -19,5 +19,3 @@ target_link_libraries(
   PUBLIC ${COCKATRICE_QT_VERSION_NAME}::Network ${COCKATRICE_QT_VERSION_NAME}::WebSockets libcockatrice_protocol
          libcockatrice_network_server_remote
 )
-
-target_precompile_headers(libcockatrice_network_client_abstract PRIVATE "${CMAKE_SOURCE_DIR}/cmake/pch/qtcore_pch.h")
diff --git a/libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.cpp b/libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.cpp
index d66653fb1..687d93666 100644
--- a/libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.cpp
+++ b/libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.cpp
@@ -1,25 +1,6 @@
 #include "abstract_client.h"
 
-#include "libcockatrice/protocol/pb/admin_commands.pb.h"
-#include "libcockatrice/protocol/pb/developer_commands.pb.h"
-#include "libcockatrice/protocol/pb/game_event_container.pb.h"
-#include "libcockatrice/protocol/pb/moderator_commands.pb.h"
-#include "libcockatrice/protocol/pb/response.pb.h"
-#include "libcockatrice/protocol/pb/room_commands.pb.h"
-#include "libcockatrice/protocol/pb/room_event.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_user.pb.h"
-#include "libcockatrice/protocol/pb/session_commands.pb.h"
-#include "libcockatrice/protocol/pb/session_event.pb.h"
-
-#include <QDebug>
-#include <QList>
-#include <QMessageLogger>
-#include <QMetaType>
-#include <QSharedPointer>
-#include <QVariant>
-#include <QtGlobal>
 #include <google/protobuf/descriptor.h>
-#include <google/protobuf/message.h>
 #include <libcockatrice/protocol/debug_pb_message.h>
 #include <libcockatrice/protocol/featureset.h>
 #include <libcockatrice/protocol/get_pb_extension.h>
diff --git a/libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.h b/libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.h
index 442e96eb2..af22a5c9d 100644
--- a/libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.h
+++ b/libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.h
@@ -11,27 +11,10 @@
 
 #include <QElapsedTimer>
 #include <QLoggingCategory>
-#include <QMap>
 #include <QMutex>
-#include <QMutexLocker>
-#include <QObject>
-#include <QString>
-
-// IWYU pragma: keep
-// ServerInfo_User appears in signal signatures, including inside QList, so the
-// moc-generated code needs the complete type.
-#include <QtGlobal>
+#include <QVariant>
+#include <libcockatrice/protocol/pb/response.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
-#include <qtmetamacros.h>
-
-namespace google
-{
-namespace protobuf
-{
-class Message;
-} // namespace protobuf
-} // namespace google
-template <typename T> class QList;
 
 inline Q_LOGGING_CATEGORY(AbstractClientLog, "abstract_client");
 
@@ -53,6 +36,7 @@ class Event_NotifyUser;
 class Event_ConnectionClosed;
 class Event_ServerShutdown;
 class Event_ReplayAdded;
+class FeatureSet;
 
 enum ClientStatus
 {
diff --git a/libcockatrice_network/libcockatrice/network/client/abstract/latency_tracker.cpp b/libcockatrice_network/libcockatrice/network/client/abstract/latency_tracker.cpp
index bc6230621..98b353fdf 100644
--- a/libcockatrice_network/libcockatrice/network/client/abstract/latency_tracker.cpp
+++ b/libcockatrice_network/libcockatrice/network/client/abstract/latency_tracker.cpp
@@ -1,10 +1,7 @@
 #include "latency_tracker.h"
 
-#include <QSharedPointer>
-#include <QtGlobal>
 #include <QtMath>
 #include <algorithm>
-#include <stddef.h>
 
 void LatencyTracker::addSample(qint64 ms)
 {
diff --git a/libcockatrice_network/libcockatrice/network/client/abstract/latency_tracker.h b/libcockatrice_network/libcockatrice/network/client/abstract/latency_tracker.h
index cae11ea4d..75f18ac0c 100644
--- a/libcockatrice_network/libcockatrice/network/client/abstract/latency_tracker.h
+++ b/libcockatrice_network/libcockatrice/network/client/abstract/latency_tracker.h
@@ -6,10 +6,8 @@
 #ifndef LATENCY_TRACKER_H
 #define LATENCY_TRACKER_H
 
-#include <QByteArray>
 #include <QList>
 #include <QMetaType>
-#include <QtGlobal>
 #include <array>
 
 /**
diff --git a/libcockatrice_network/libcockatrice/network/client/local/CMakeLists.txt b/libcockatrice_network/libcockatrice/network/client/local/CMakeLists.txt
index 08c12b7f8..2ac12e1fe 100644
--- a/libcockatrice_network/libcockatrice/network/client/local/CMakeLists.txt
+++ b/libcockatrice_network/libcockatrice/network/client/local/CMakeLists.txt
@@ -19,5 +19,3 @@ target_link_libraries(
   PUBLIC ${COCKATRICE_QT_VERSION_NAME}::Network ${COCKATRICE_QT_VERSION_NAME}::WebSockets
          libcockatrice_network_client_abstract
 )
-
-target_precompile_headers(libcockatrice_network_client_local PRIVATE "${CMAKE_SOURCE_DIR}/cmake/pch/qtcore_pch.h")
diff --git a/libcockatrice_network/libcockatrice/network/client/local/local_client.cpp b/libcockatrice_network/libcockatrice/network/client/local/local_client.cpp
index c1c1cc976..eefa3a2f3 100644
--- a/libcockatrice_network/libcockatrice/network/client/local/local_client.cpp
+++ b/libcockatrice_network/libcockatrice/network/client/local/local_client.cpp
@@ -1,17 +1,9 @@
 #include "local_client.h"
 
 #include "../../server/local/local_server_interface.h"
-#include "abstract_client.h"
-#include "libcockatrice/protocol/pb/commands.pb.h"
-#include "libcockatrice/protocol/pb/server_message.pb.h"
 
-#include <QDebug>
-#include <QMessageLogger>
 #include <libcockatrice/protocol/debug_pb_message.h>
 #include <libcockatrice/protocol/pb/session_commands.pb.h>
-#include <string>
-
-class QObject;
 
 LocalClient::LocalClient(LocalServerInterface *_lsi,
                          const QString &_playerName,
diff --git a/libcockatrice_network/libcockatrice/network/client/local/local_client.h b/libcockatrice_network/libcockatrice/network/client/local/local_client.h
index 3ae570255..9e1c89ddd 100644
--- a/libcockatrice_network/libcockatrice/network/client/local/local_client.h
+++ b/libcockatrice_network/libcockatrice/network/client/local/local_client.h
@@ -10,11 +10,6 @@
 #include "../abstract/abstract_client.h"
 
 #include <QLoggingCategory>
-#include <QString>
-#include <qtmetamacros.h>
-
-class QObject;
-class ServerMessage;
 
 inline Q_LOGGING_CATEGORY(LocalClientLog, "local_client");
 
diff --git a/libcockatrice_network/libcockatrice/network/client/remote/CMakeLists.txt b/libcockatrice_network/libcockatrice/network/client/remote/CMakeLists.txt
index c32ca0aa8..cb68d0c37 100644
--- a/libcockatrice_network/libcockatrice/network/client/remote/CMakeLists.txt
+++ b/libcockatrice_network/libcockatrice/network/client/remote/CMakeLists.txt
@@ -19,5 +19,3 @@ target_link_libraries(
   PUBLIC ${COCKATRICE_QT_VERSION_NAME}::Network ${COCKATRICE_QT_VERSION_NAME}::WebSockets
          libcockatrice_network_client_abstract libcockatrice_interfaces libcockatrice_utility libcockatrice_protocol
 )
-
-target_precompile_headers(libcockatrice_network_client_remote PRIVATE "${CMAKE_SOURCE_DIR}/cmake/pch/qtcore_pch.h")
diff --git a/libcockatrice_network/libcockatrice/network/client/remote/remote_client.cpp b/libcockatrice_network/libcockatrice/network/client/remote/remote_client.cpp
index feda9e3f4..de2cc720f 100644
--- a/libcockatrice_network/libcockatrice/network/client/remote/remote_client.cpp
+++ b/libcockatrice_network/libcockatrice/network/client/remote/remote_client.cpp
@@ -1,8 +1,5 @@
 #include "remote_client.h"
 
-#include "abstract_client.h"
-#include "libcockatrice/protocol/pb/commands.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_user.pb.h"
 #include "version_string.h"
 
 #include <QCryptographicHash>
@@ -10,21 +7,13 @@
 #include <QHostAddress>
 #include <QHostInfo>
 #include <QList>
-#include <QMap>
-#include <QMessageLogger>
-#include <QMutableMapIterator>
-#include <QSharedPointer>
-#include <QStringList>
 #include <QThread>
 #include <QTimer>
-#include <QUrl>
 #include <QWebSocket>
-#include <QWebSocketProtocol>
-#include <QtGlobal>
-#include <google/protobuf/stubs/common.h>
 #include <libcockatrice/interfaces/interface_network_settings_provider.h>
 #include <libcockatrice/protocol/debug_pb_message.h>
 #include <libcockatrice/protocol/pb/event_server_identification.pb.h>
+#include <libcockatrice/protocol/pb/response_activate.pb.h>
 #include <libcockatrice/protocol/pb/response_forgotpasswordrequest.pb.h>
 #include <libcockatrice/protocol/pb/response_login.pb.h>
 #include <libcockatrice/protocol/pb/response_password_salt.pb.h>
@@ -33,10 +22,6 @@
 #include <libcockatrice/protocol/pb/session_commands.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
 #include <libcockatrice/utility/passwordhasher.h>
-#include <string>
-
-class Event_ConnectionClosed;
-class QObject;
 
 static const unsigned int protocolVersion = 14;
 
diff --git a/libcockatrice_network/libcockatrice/network/client/remote/remote_client.h b/libcockatrice_network/libcockatrice/network/client/remote/remote_client.h
index 4d8c24fd2..862dac06e 100644
--- a/libcockatrice_network/libcockatrice/network/client/remote/remote_client.h
+++ b/libcockatrice_network/libcockatrice/network/client/remote/remote_client.h
@@ -8,23 +8,11 @@
 #define REMOTECLIENT_H
 
 #include "../abstract/abstract_client.h"
-#include "libcockatrice/protocol/pb/response.pb.h"
-#include "libcockatrice/protocol/pb/session_commands.pb.h"
 
-#include <QAbstractSocket>
-#include <QByteArray>
 #include <QLoggingCategory>
-#include <QString>
-#include <QTcpSocket>
 #include <QWebSocket>
-#include <QtGlobal>
-#include <qtmetamacros.h>
-
-class Event_ConnectionClosed;
-class Event_ServerIdentification;
-class INetworkSettingsProvider;
-class QObject;
-template <typename T> class QList;
+#include <libcockatrice/interfaces/interface_network_settings_provider.h>
+#include <libcockatrice/protocol/pb/commands.pb.h>
 
 inline Q_LOGGING_CATEGORY(RemoteClientLog, "remote_client");
 
diff --git a/libcockatrice_network/libcockatrice/network/server/local/CMakeLists.txt b/libcockatrice_network/libcockatrice/network/server/local/CMakeLists.txt
index 020753d7f..494ae1294 100644
--- a/libcockatrice_network/libcockatrice/network/server/local/CMakeLists.txt
+++ b/libcockatrice_network/libcockatrice/network/server/local/CMakeLists.txt
@@ -15,5 +15,3 @@ add_dependencies(libcockatrice_network_server_local libcockatrice_protocol)
 target_include_directories(libcockatrice_network_server_local PUBLIC .)
 
 target_link_libraries(libcockatrice_network_server_local PUBLIC ${COCKATRICE_QT_MODULES} libcockatrice_protocol)
-
-target_precompile_headers(libcockatrice_network_server_local PRIVATE "${CMAKE_SOURCE_DIR}/cmake/pch/qtcore_pch.h")
diff --git a/libcockatrice_network/libcockatrice/network/server/local/local_server.cpp b/libcockatrice_network/libcockatrice/network/server/local/local_server.cpp
index ebfc9bdeb..8f9d82aa4 100644
--- a/libcockatrice_network/libcockatrice/network/server/local/local_server.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/local/local_server.cpp
@@ -1,17 +1,8 @@
 #include "local_server.h"
 
-#include "../remote/server.h"
-#include "../remote/server_database_interface.h"
-#include "../remote/server_protocolhandler.h"
-#include "libcockatrice/protocol/pb/serverinfo_user.pb.h"
 #include "local_server_interface.h"
 
 #include <../remote/server_room.h>
-#include <QList>
-#include <QStringList>
-#include <string>
-
-class QObject;
 
 LocalServer::LocalServer(QObject *parent) : Server(parent)
 {
diff --git a/libcockatrice_network/libcockatrice/network/server/local/local_server.h b/libcockatrice_network/libcockatrice/network/server/local/local_server.h
index ee8d487d2..0112afa72 100644
--- a/libcockatrice_network/libcockatrice/network/server/local/local_server.h
+++ b/libcockatrice_network/libcockatrice/network/server/local/local_server.h
@@ -9,11 +9,8 @@
 
 #include <../remote/server.h>
 #include <../remote/server_database_interface.h>
-#include <QString>
-#include <qtmetamacros.h>
 
 class LocalServerInterface;
-class QObject;
 
 class LocalServer : public Server
 {
diff --git a/libcockatrice_network/libcockatrice/network/server/local/local_server_interface.cpp b/libcockatrice_network/libcockatrice/network/server/local/local_server_interface.cpp
index b7c8d4bfa..bb86198af 100644
--- a/libcockatrice_network/libcockatrice/network/server/local/local_server_interface.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/local/local_server_interface.cpp
@@ -1,10 +1,8 @@
 #include "local_server_interface.h"
 
-#include "../remote/server_protocolhandler.h"
 #include "local_server.h"
 
-class CommandContainer;
-class Server_DatabaseInterface;
+#include <QDebug>
 
 LocalServerInterface::LocalServerInterface(LocalServer *_server, Server_DatabaseInterface *_databaseInterface)
     : Server_ProtocolHandler(_server, _databaseInterface, _server)
diff --git a/libcockatrice_network/libcockatrice/network/server/local/local_server_interface.h b/libcockatrice_network/libcockatrice/network/server/local/local_server_interface.h
index 8aadb40ca..44e3b3e53 100644
--- a/libcockatrice_network/libcockatrice/network/server/local/local_server_interface.h
+++ b/libcockatrice_network/libcockatrice/network/server/local/local_server_interface.h
@@ -8,13 +8,8 @@
 #define LOCALSERVERINTERFACE_H
 
 #include <../remote/server_protocolhandler.h>
-#include <QString>
-#include <qtmetamacros.h>
 
 class LocalServer;
-class CommandContainer;
-class ServerMessage;
-class Server_DatabaseInterface;
 
 class LocalServerInterface : public Server_ProtocolHandler
 {
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/CMakeLists.txt b/libcockatrice_network/libcockatrice/network/server/remote/CMakeLists.txt
index 2127487d2..e11a962d1 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/CMakeLists.txt
+++ b/libcockatrice_network/libcockatrice/network/server/remote/CMakeLists.txt
@@ -3,7 +3,6 @@ set(CMAKE_AUTOUIC ON)
 set(CMAKE_AUTORCC ON)
 
 set(HEADERS
-    game/dump_zone_range.h
     game/server_abstract_participant.h
     game/server_abstract_player.h
     game/server_arrow.h
@@ -34,7 +33,6 @@ qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
 add_library(
   libcockatrice_network_server_remote STATIC
   ${MOC_SOURCES}
-  game/dump_zone_range.cpp
   game/server_abstract_participant.cpp
   game/server_abstract_player.cpp
   game/server_arrow.cpp
@@ -64,5 +62,3 @@ target_link_libraries(
   libcockatrice_network_server_remote PUBLIC libcockatrice_protocol libcockatrice_utility libcockatrice_rng
                                              libcockatrice_deck_list ${COCKATRICE_QT_MODULES}
 )
-
-target_precompile_headers(libcockatrice_network_server_remote PRIVATE "${CMAKE_SOURCE_DIR}/cmake/pch/qtcore_pch.h")
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/dump_zone_range.cpp b/libcockatrice_network/libcockatrice/network/server/remote/game/dump_zone_range.cpp
deleted file mode 100644
index 4ecca95cb..000000000
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/dump_zone_range.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-#include "dump_zone_range.h"
-
-#include <algorithm>
-
-std::pair<qsizetype, qsizetype> dumpZoneCardRange(qsizetype cardCount, int numberCards, bool isReversed)
-{
-    qsizetype count = 0;
-    if (numberCards == -1) {
-        count = cardCount;
-    } else if (numberCards > 0) {
-        count = std::min<qsizetype>(numberCards, cardCount);
-    }
-    count = std::max<qsizetype>(count, 0);
-
-    const qsizetype begin = isReversed ? cardCount - count : 0;
-    return {begin, begin + count};
-}
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/dump_zone_range.h b/libcockatrice_network/libcockatrice/network/server/remote/game/dump_zone_range.h
deleted file mode 100644
index a688b09d0..000000000
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/dump_zone_range.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef DUMP_ZONE_RANGE_H
-#define DUMP_ZONE_RANGE_H
-
-#include <QtGlobal>
-#include <utility>
-
-/**
- * @brief Resolve a client's zone dump request against a zone's real card count.
- *
- * @c number_cards arrives from the client unvalidated. -1 means "the whole zone", which
- * is the convention the client uses when sizing its own view of one. Every other negative
- * value, and every value larger than the zone, has to be brought into range rather than
- * used as an index: with a reversed request the zone offset is
- * @c cardCount - @c numberCards, which runs off the front of the list when the request
- * exceeds the zone and off the back when @c numberCards is -1.
- *
- * Kept in its own translation unit so it can be exercised without the rest of
- * server_abstract_player.cpp, which refers to the RNG global that only the servatrice
- * binary defines.
- *
- * @param cardCount number of cards the zone actually holds
- * @param numberCards the requested count, -1 for the whole zone
- * @param isReversed take the trailing cards instead of the leading ones
- * @return the half-open index range [begin, end) into the zone's card list, always
- *         contained in [0, cardCount)
- */
-std::pair<qsizetype, qsizetype> dumpZoneCardRange(qsizetype cardCount, int numberCards, bool isReversed);
-
-#endif // DUMP_ZONE_RANGE_H
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_participant.cpp b/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_participant.cpp
index 5b8d901bb..a6280ffa1 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_participant.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_participant.cpp
@@ -4,16 +4,10 @@
 #include "../server_abstractuserinterface.h"
 #include "../server_database_interface.h"
 #include "../server_room.h"
-#include "game/server_abstract_player.h"
-#include "libcockatrice/protocol/pb/event_leave.pb.h"
-#include "libcockatrice/protocol/pb/game_commands.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_playerproperties.pb.h"
+#include "server_card.h"
 #include "server_game.h"
-#include "server_response_containers.h"
-#include "serverinfo_user_container.h"
+#include "server_player.h"
 
-#include <QMutexLocker>
-#include <QString>
 #include <libcockatrice/protocol/get_pb_extension.h>
 #include <libcockatrice/protocol/pb/command_attach_card.pb.h>
 #include <libcockatrice/protocol/pb/command_change_zone_properties.pb.h>
@@ -56,7 +50,6 @@
 #include <libcockatrice/protocol/pb/serverinfo_player.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
 #include <libcockatrice/utility/string_limits.h>
-#include <string>
 
 Server_AbstractParticipant::Server_AbstractParticipant(Server_Game *_game,
                                                        int _playerId,
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_participant.h b/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_participant.h
index 195da9b7f..c78ae78c1 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_participant.h
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_participant.h
@@ -5,8 +5,8 @@
 #include "server_arrowtarget.h"
 
 #include <QMutex>
+#include <libcockatrice/protocol/pb/card_attributes.pb.h>
 #include <libcockatrice/protocol/pb/response.pb.h>
-#include <qtmetamacros.h>
 
 class Server_Game;
 class Server_AbstractUserInterface;
@@ -17,6 +17,7 @@ class GameEventContainer;
 class GameEventStorage;
 class ResponseContainer;
 class GameCommand;
+
 class Command_KickFromGame;
 class Command_LeaveGame;
 class Command_GameSay;
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_player.cpp b/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_player.cpp
index c03f1e966..6b4101a99 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_player.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_player.cpp
@@ -1,34 +1,14 @@
 #include "server_abstract_player.h"
 
-#include "dump_zone_range.h"
-#include "game/server_abstract_participant.h"
-#include "game/server_arrowtarget.h"
-#include "libcockatrice/protocol/pb/card_attributes.pb.h"
-#include "libcockatrice/protocol/pb/color.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_arrow.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_card.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_cardcounter.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_playerproperties.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_zone.pb.h"
-#include "libcockatrice/utility/card_ref.h"
-#include "libcockatrice/utility/playmat_params.h"
 #include "server_arrow.h"
 #include "server_card.h"
 #include "server_cardzone.h"
 #include "server_game.h"
 #include "server_move_card_struct.h"
-#include "server_response_containers.h"
 
-#include <QList>
-#include <QListIterator>
-#include <QMapIterator>
-#include <QObject>
-#include <QSet>
-#include <QSharedPointer>
-#include <QVariant>
+#include <QDebug>
+#include <QRegularExpression>
 #include <algorithm>
-#include <google/protobuf/stubs/port.h>
-#include <iterator>
 #include <libcockatrice/deck_list/deck_list.h>
 #include <libcockatrice/protocol/pb/command_attach_card.pb.h>
 #include <libcockatrice/protocol/pb/command_change_zone_properties.pb.h>
@@ -70,11 +50,8 @@
 #include <libcockatrice/utility/dice_limits.h>
 #include <libcockatrice/utility/string_limits.h>
 #include <libcockatrice/utility/zone_names.h>
+#include <limits>
 #include <ranges>
-#include <set>
-#include <string>
-
-class Server_AbstractUserInterface;
 
 Server_AbstractPlayer::Server_AbstractPlayer(Server_Game *_game,
                                              int _playerId,
@@ -1436,23 +1413,23 @@ Server_AbstractPlayer::cmdDumpZone(const Command_DumpZone &cmd, ResponseContaine
 
     int numberCards = cmd.number_cards();
     const QList<Server_Card *> &cards = zone->getCards();
-    const auto cardRange = dumpZoneCardRange(cards.size(), numberCards, cmd.is_reversed());
 
     auto *re = new Response_DumpZone;
     ServerInfo_Zone *zoneInfo = re->mutable_zone_info();
     zoneInfo->set_name(zone->getName().toStdString());
     zoneInfo->set_type(zone->getType());
     zoneInfo->set_with_coords(zone->hasCoords());
-    zoneInfo->set_card_count(cards.size());
+    zoneInfo->set_card_count(numberCards < cards.size() ? cards.size() : numberCards);
 
-    for (qsizetype findId = cardRange.first; findId < cardRange.second; ++findId) {
-        Server_Card *card = cards.at(findId);
+    for (int i = 0; (i < cards.size()) && (i < numberCards || numberCards == -1); ++i) {
+        const auto &findId = cmd.is_reversed() ? cards.size() - numberCards + i : i;
+        Server_Card *card = cards[findId];
         QString displayedName = card->getFaceDown() ? QString() : card->getName();
         ServerInfo_Card *cardInfo = zoneInfo->add_card_list();
         cardInfo->set_provider_id(card->getProviderId().toStdString());
         cardInfo->set_name(displayedName.toStdString());
         if (zone->getType() == ServerInfo_Zone::HiddenZone) {
-            cardInfo->set_id(static_cast<int>(findId));
+            cardInfo->set_id(findId);
         } else {
             cardInfo->set_id(card->getId());
             cardInfo->set_x(card->getX());
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_player.h b/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_player.h
index ae20955bf..4cc79c5fe 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_player.h
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_player.h
@@ -1,32 +1,25 @@
 #ifndef ABSTRACT_PLAYER_H
 #define ABSTRACT_PLAYER_H
 
-#include "libcockatrice/protocol/pb/response.pb.h"
+#include "../serverinfo_user_container.h"
 #include "server_abstract_participant.h"
 
 #include <QMap>
 #include <QString>
-#include <qtmetamacros.h>
 
 class CardToMove;
 class DeckList;
 class Server_Arrow;
 class Server_Card;
 class Server_CardZone;
+class Server_Counter;
 struct MoveCardStruct;
-class GameEventStorage;
-class ServerInfo_User;
-class Server_AbstractUserInterface;
-class Server_Game;
-enum CardAttribute : int;
-template <typename T> class QList;
 
 class Server_AbstractPlayer : public Server_AbstractParticipant
 {
     Q_OBJECT
 private:
     class MoveCardCompareFunctor;
-
     QMap<int, Server_Arrow *> arrows;
 
     void sendCreateTokenEvents(Server_CardZone *zone, Server_Card *card, int xCoord, int yCoord, GameEventStorage &ges);
@@ -56,10 +49,6 @@ public:
     {
         return deck;
     }
-    bool getSideboardLocked() const
-    {
-        return sideboardLocked;
-    }
     bool getReadyStart() const
     {
         return readyStart;
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_arrow.cpp b/libcockatrice_network/libcockatrice/network/server/remote/game/server_arrow.cpp
index b5ccff8fe..2ad38b977 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_arrow.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_arrow.cpp
@@ -1,16 +1,10 @@
 #include "server_arrow.h"
 
-#include "game/server_abstract_player.h"
-#include "game/server_arrowtarget.h"
-#include "libcockatrice/protocol/pb/color.pb.h"
 #include "server_card.h"
 #include "server_cardzone.h"
 #include "server_player.h"
 
-#include <QObject>
-#include <QString>
 #include <libcockatrice/protocol/pb/serverinfo_arrow.pb.h>
-#include <string>
 
 Server_Arrow::Server_Arrow(int _id,
                            Server_Card *_startCard,
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_arrowtarget.h b/libcockatrice_network/libcockatrice/network/server/remote/game/server_arrowtarget.h
index c4da725c2..5a080018d 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_arrowtarget.h
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_arrowtarget.h
@@ -2,7 +2,6 @@
 #define SERVER_ARROWTARGET_H
 
 #include <QObject>
-#include <qtmetamacros.h>
 
 class Server_ArrowTarget : public QObject
 {
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_card.cpp b/libcockatrice_network/libcockatrice/network/server/remote/game/server_card.cpp
index c79f13634..8c7feadba 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_card.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_card.cpp
@@ -19,22 +19,16 @@
  ***************************************************************************/
 #include "server_card.h"
 
-#include "game/server_abstract_player.h"
-#include "libcockatrice/protocol/pb/card_attributes.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_cardcounter.pb.h"
-#include "libcockatrice/utility/card_ref.h"
 #include "server_cardzone.h"
+#include "server_player.h"
 
-#include <QMapIterator>
-#include <QSharedPointer>
 #include <QVariant>
-#include <QtGlobal>
 #include <libcockatrice/protocol/pb/event_set_card_attr.pb.h>
 #include <libcockatrice/protocol/pb/event_set_card_counter.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_card.pb.h>
 #include <libcockatrice/utility/clamped_arithmetic.h>
 #include <libcockatrice/utility/counter_limits.h>
-#include <string>
+#include <limits>
 
 Server_Card::Server_Card(const CardRef &cardRef, int _id, int _coord_x, int _coord_y, Server_CardZone *_zone)
     : zone(_zone), id(_id), coord_x(_coord_x), coord_y(_coord_y), cardRef(cardRef), tapped(false), attacking(false),
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_card.h b/libcockatrice_network/libcockatrice/network/server/remote/game/server_card.h
index cffd9eb40..a2698ad61 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_card.h
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_card.h
@@ -22,18 +22,15 @@
 
 #include "server_arrowtarget.h"
 
-#include <QList>
 #include <QMap>
 #include <QString>
-#include <QtGlobal>
+#include <libcockatrice/protocol/pb/card_attributes.pb.h>
+#include <libcockatrice/protocol/pb/serverinfo_card.pb.h>
 #include <libcockatrice/utility/card_ref.h>
-#include <qtmetamacros.h>
 
 class Server_CardZone;
 class Event_SetCardCounter;
 class Event_SetCardAttr;
-class ServerInfo_Card;
-enum CardAttribute : int;
 
 class Server_Card : public Server_ArrowTarget
 {
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_cardzone.cpp b/libcockatrice_network/libcockatrice/network/server/remote/game/server_cardzone.cpp
index 5f40aa480..1db4f9c4c 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_cardzone.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_cardzone.cpp
@@ -19,21 +19,13 @@
  ***************************************************************************/
 #include "server_cardzone.h"
 
-#include "libcockatrice/protocol/pb/serverinfo_zone.pb.h"
 #include "server_abstract_player.h"
 #include "server_card.h"
 
 #include <QDebug>
-#include <QListIterator>
-#include <QMultiMap>
-#include <QPair>
 #include <QSet>
-#include <QSetIterator>
-#include <QSharedPointer>
 #include <libcockatrice/protocol/pb/command_move_card.pb.h>
 #include <libcockatrice/rng/rng_abstract.h>
-#include <qlogging.h>
-#include <string>
 
 Server_CardZone::Server_CardZone(Server_AbstractPlayer *_player,
                                  const QString &_name,
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_cardzone.h b/libcockatrice_network/libcockatrice/network/server/remote/game/server_cardzone.h
index 9ed39a159..77fea54ca 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_cardzone.h
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_cardzone.h
@@ -20,16 +20,15 @@
 #ifndef SERVER_CARDZONE_H
 #define SERVER_CARDZONE_H
 
-#include <QList>
 #include <QMap>
 #include <QSet>
 #include <QString>
-#include <QtGlobal>
 #include <libcockatrice/protocol/pb/serverinfo_zone.pb.h>
 
 class Server_Card;
 class Server_AbstractPlayer;
 class Server_AbstractParticipant;
+class Server_Game;
 class GameEventStorage;
 
 class Server_CardZone
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_counter.cpp b/libcockatrice_network/libcockatrice/network/server/remote/game/server_counter.cpp
index f3dcb0fb1..b18e11c2b 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_counter.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_counter.cpp
@@ -1,9 +1,6 @@
 #include "server_counter.h"
 
-#include "libcockatrice/protocol/pb/color.pb.h"
-
 #include <libcockatrice/protocol/pb/serverinfo_counter.pb.h>
-#include <string>
 
 Server_Counter::Server_Counter(int _id, const QString &_name, const color &_counterColor, int _radius, int _count)
     : id(_id), name(_name), counterColor(_counterColor), radius(_radius), count(_count)
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_game.cpp b/libcockatrice_network/libcockatrice/network/server/remote/game/server_game.cpp
index b1863c91e..131ff1077 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_game.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_game.cpp
@@ -23,46 +23,21 @@
 #include "../server_database_interface.h"
 #include "../server_protocolhandler.h"
 #include "../server_room.h"
-#include "game/game_config.h"
-#include "game/server_abstract_participant.h"
-#include "game/server_arrowtarget.h"
-#include "game/server_deck_validation_strategy.h"
-#include "game/server_game_lifecycle_strategy.h"
-#include "game/server_match_result_strategy.h"
 #include "libcockatrice/protocol/pb/command_move_card.pb.h"
-#include "libcockatrice/protocol/pb/game_event.pb.h"
-#include "libcockatrice/protocol/pb/game_event_container.pb.h"
-#include "libcockatrice/protocol/pb/response.pb.h"
-#include "libcockatrice/protocol/pb/server_message.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_game.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_gametype.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_playerproperties.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_replay.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_replay_match.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_user.pb.h"
-#include "libcockatrice/protocol/pb/session_event.pb.h"
 #include "server_abstract_player.h"
-#include "server_abstractuserinterface.h"
 #include "server_arrow.h"
 #include "server_card.h"
 #include "server_cardzone.h"
 #include "server_player.h"
-#include "server_response_containers.h"
 #include "server_spectator.h"
 
 #include <QDebug>
 #include <QElapsedTimer>
-#include <QMutexLocker>
-#include <QReadWriteLock>
 #include <QRegularExpression>
-#include <QRegularExpressionMatch>
-#include <QSharedPointer>
-#include <QStringList>
 #include <QTimer>
 #include <google/protobuf/descriptor.h>
-#include <google/protobuf/message.h>
 #include <libcockatrice/deck_list/deck_list.h>
-#include <libcockatrice/protocol/pb/context_deck_select.pb.h>
+#include <libcockatrice/protocol/pb/context_connection_state_changed.pb.h>
 #include <libcockatrice/protocol/pb/context_ping_changed.pb.h>
 #include <libcockatrice/protocol/pb/event_delete_arrow.pb.h>
 #include <libcockatrice/protocol/pb/event_game_closed.pb.h>
@@ -78,9 +53,6 @@
 #include <libcockatrice/protocol/pb/event_set_active_player.pb.h>
 #include <libcockatrice/protocol/pb/game_replay.pb.h>
 #include <libcockatrice/utility/zone_names.h>
-#include <qlogging.h>
-#include <qnamespace.h>
-#include <string>
 
 Server_Game::Server_Game(const GameConfig &config, Server_Room *_room)
     : QObject(), room(_room), nextPlayerId(0), hostId(0), creatorInfo(new ServerInfo_User(config.creatorInfo)),
@@ -827,48 +799,6 @@ void Server_Game::createGameJoinedEvent(Server_AbstractParticipant *joiningParti
     }
 
     rc.enqueuePostResponseItem(ServerMessage::GAME_EVENT_CONTAINER, prepareGameEvent(event2, -1));
-
-    // A newly joined player never saw the "Player X has loaded a deck" messages
-    // (they are only broadcast when a deck is selected), so replay a deck-select
-    // context for every player that already has a deck loaded. It is delivered
-    // privately to the joining participant, whose client renders it as a log
-    // entry in the same way as a fresh deck selection. Skipped on reconnect
-    // (resuming) — the player already saw these — and once the game has started,
-    // when the message is no longer useful and would only spam the log.
-    if (!resuming && !gameStarted) {
-        for (auto *participant : participants.values()) {
-            if (participant == joiningParticipant) {
-                continue;
-            }
-            auto *deckOwner = qobject_cast<Server_Player *>(participant);
-            if (deckOwner == nullptr) {
-                continue;
-            }
-            const DeckList *deckList = deckOwner->getDeckList();
-            if (deckList == nullptr) {
-                continue;
-            }
-
-            Event_PlayerPropertiesChanged event;
-            event.mutable_player_properties()->set_sideboard_locked(deckOwner->getSideboardLocked());
-            event.mutable_player_properties()->set_deck_hash(deckList->getDeckHash().toStdString());
-
-            Context_DeckSelect deckSelect;
-            deckSelect.set_deck_hash(deckList->getDeckHash().toStdString());
-            deckSelect.set_sideboard_size(deckList->getSideboardSize());
-            if (getShareDecklistsOnLoad()) {
-                deckSelect.set_deck_list(deckList->writeToString_Native().toStdString());
-            }
-
-            GameEventContext context;
-            context.GetReflection()
-                ->MutableMessage(&context, deckSelect.GetDescriptor()->FindExtensionByName("ext"))
-                ->CopyFrom(deckSelect);
-
-            rc.enqueuePostResponseItem(ServerMessage::GAME_EVENT_CONTAINER,
-                                       prepareGameEvent(event, deckOwner->getPlayerId(), &context));
-        }
-    }
 }
 
 void Server_Game::sendGameEventContainer(GameEventContainer *cont,
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_game.h b/libcockatrice_network/libcockatrice/network/server/remote/game/server_game.h
index c7f8d0929..1ed4fe4ca 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_game.h
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_game.h
@@ -21,25 +21,21 @@
 #define SERVERGAME_H
 
 #include "../server_response_containers.h"
-#include "libcockatrice/protocol/pb/game_event_context.pb.h"
+#include "game_config.h"
+#include "server_deck_validation_strategy.h"
+#include "server_game_lifecycle_strategy.h"
+#include "server_match_result_strategy.h"
 
-// IWYU pragma: keep
-// ServerInfo_Game is passed by value to the gameInfoChanged() signal, so the
-// moc-generated code needs the complete type.
 #include <QDateTime>
-#include <QList>
 #include <QMap>
+#include <QMutex>
 #include <QObject>
-#include <QRecursiveMutex>
 #include <QScopedPointer>
 #include <QSet>
-#include <QString>
-#include <QtGlobal>
-#include <atomic>
+#include <QStringList>
 #include <libcockatrice/protocol/pb/event_leave.pb.h>
 #include <libcockatrice/protocol/pb/response.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_game.pb.h>
-#include <qtmetamacros.h>
 
 class QTimer;
 class GameEventContainer;
@@ -51,17 +47,6 @@ class ServerInfo_User;
 class ServerInfo_Game;
 class Server_AbstractUserInterface;
 class Event_GameStateChanged;
-class Server_DeckValidationStrategy;
-class Server_GameLifecycleStrategy;
-class Server_MatchResultStrategy;
-namespace google
-{
-namespace protobuf
-{
-class Message;
-} // namespace protobuf
-} // namespace google
-struct GameConfig;
 
 class Server_Game : public QObject
 {
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_player.cpp b/libcockatrice_network/libcockatrice/network/server/remote/game/server_player.cpp
index a4c904c01..cafa33c07 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_player.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_player.cpp
@@ -1,34 +1,23 @@
 #include "server_player.h"
 
 #include "../server.h"
+#include "../server_abstractuserinterface.h"
 #include "../server_database_interface.h"
 #include "../server_room.h"
-#include "game/server_abstract_participant.h"
-#include "game/server_abstract_player.h"
-#include "libcockatrice/deck_list/tree/inner_deck_list_node.h"
-#include "libcockatrice/protocol/pb/color.pb.h"
-#include "libcockatrice/protocol/pb/move_card_to_zone.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_card.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_counter.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_playerproperties.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_zone.pb.h"
-#include "libcockatrice/utility/card_ref.h"
-#include "libcockatrice/utility/playmat_params.h"
 #include "server_card.h"
 #include "server_cardzone.h"
 #include "server_counter.h"
 #include "server_game.h"
 #include "server_move_card_struct.h"
-#include "server_response_containers.h"
 
-#include <QMapIterator>
-#include <QSet>
-#include <QSharedPointer>
-#include <QString>
-#include <QtGlobal>
-#include <google/protobuf/stubs/port.h>
+#include <QDebug>
+#include <QRegularExpression>
+#include <algorithm>
 #include <libcockatrice/deck_list/deck_list.h>
+#include <libcockatrice/deck_list/tree/deck_list_card_node.h>
+#include <libcockatrice/protocol/pb/command_attach_card.pb.h>
 #include <libcockatrice/protocol/pb/command_change_zone_properties.pb.h>
+#include <libcockatrice/protocol/pb/command_concede.pb.h>
 #include <libcockatrice/protocol/pb/command_create_counter.pb.h>
 #include <libcockatrice/protocol/pb/command_deck_select.pb.h>
 #include <libcockatrice/protocol/pb/command_del_counter.pb.h>
@@ -54,15 +43,13 @@
 #include <libcockatrice/protocol/pb/event_shuffle.pb.h>
 #include <libcockatrice/protocol/pb/response.pb.h>
 #include <libcockatrice/protocol/pb/response_deck_download.pb.h>
+#include <libcockatrice/protocol/pb/response_dump_zone.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_player.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
+#include <libcockatrice/rng/rng_abstract.h>
 #include <libcockatrice/utility/color.h>
 #include <libcockatrice/utility/string_limits.h>
 #include <libcockatrice/utility/zone_names.h>
-#include <qalgorithms.h>
-#include <string>
-
-class Server_AbstractUserInterface;
 
 Server_Player::Server_Player(Server_Game *_game,
                              int _playerId,
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_player.h b/libcockatrice_network/libcockatrice/network/server/remote/game/server_player.h
index 5d514a344..c35428480 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_player.h
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_player.h
@@ -1,19 +1,8 @@
 #ifndef PLAYER_H
 #define PLAYER_H
 
-#include "libcockatrice/protocol/pb/response.pb.h"
 #include "server_abstract_player.h"
 
-#include <QList>
-#include <QMap>
-#include <qtmetamacros.h>
-
-class GameEventStorage;
-class ServerInfo_User;
-class Server_AbstractUserInterface;
-class Server_Counter;
-class Server_Game;
-
 class Server_Player : public Server_AbstractPlayer
 {
     Q_OBJECT
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_spectator.cpp b/libcockatrice_network/libcockatrice/network/server/remote/game/server_spectator.cpp
index d1c369949..bc873e386 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_spectator.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_spectator.cpp
@@ -1,11 +1,5 @@
 #include "server_spectator.h"
 
-#include "game/server_abstract_participant.h"
-
-class ServerInfo_User;
-class Server_AbstractUserInterface;
-class Server_Game;
-
 Server_Spectator::Server_Spectator(Server_Game *_game,
                                    int _playerId,
                                    const ServerInfo_User &_userInfo,
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_spectator.h b/libcockatrice_network/libcockatrice/network/server/remote/game/server_spectator.h
index 2a8995ec3..4d3928a63 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_spectator.h
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_spectator.h
@@ -3,12 +3,6 @@
 
 #include "server_abstract_participant.h"
 
-#include <qtmetamacros.h>
-
-class ServerInfo_User;
-class Server_AbstractUserInterface;
-class Server_Game;
-
 class Server_Spectator : public Server_AbstractParticipant
 {
     Q_OBJECT
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/server.cpp b/libcockatrice_network/libcockatrice/network/server/remote/server.cpp
index 73b13e23e..7abccfca8 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/server.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/remote/server.cpp
@@ -19,36 +19,16 @@
  ***************************************************************************/
 #include "server.h"
 
-#include "game/server_abstract_participant.h"
 #include "game/server_game.h"
-#include "libcockatrice/protocol/pb/commands.pb.h"
-#include "libcockatrice/protocol/pb/game_commands.pb.h"
-#include "libcockatrice/protocol/pb/game_event_container.pb.h"
-#include "libcockatrice/protocol/pb/response.pb.h"
-#include "libcockatrice/protocol/pb/room_commands.pb.h"
-#include "libcockatrice/protocol/pb/room_event.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_ban.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_game.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_room.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_user.pb.h"
-#include "server_abstractuserinterface.h"
+#include "game/server_player.h"
 #include "server_database_interface.h"
 #include "server_protocolhandler.h"
 #include "server_remoteuserinterface.h"
-#include "server_response_containers.h"
 #include "server_room.h"
-#include "serverinfo_user_container.h"
 
-#include <QDateTime>
+#include <QCoreApplication>
 #include <QDebug>
-#include <QMapIterator>
-#include <QMetaType>
-#include <QPair>
-#include <QReadLocker>
-#include <QSharedPointer>
 #include <QThread>
-#include <QWriteLocker>
-#include <google/protobuf/stubs/port.h>
 #include <libcockatrice/protocol/debug_pb_message.h>
 #include <libcockatrice/protocol/pb/event_connection_closed.pb.h>
 #include <libcockatrice/protocol/pb/event_list_rooms.pb.h>
@@ -56,10 +36,6 @@
 #include <libcockatrice/protocol/pb/event_user_left.pb.h>
 #include <libcockatrice/protocol/pb/isl_message.pb.h>
 #include <libcockatrice/protocol/pb/session_event.pb.h>
-#include <qlogging.h>
-#include <qnamespace.h>
-#include <string>
-#include <utility>
 
 Server::Server(QObject *parent) : QObject(parent), nextLocalGameId(0), tcpUserCount(0), webSocketUserCount(0)
 {
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/server.h b/libcockatrice_network/libcockatrice/network/server/remote/server.h
index 99247bb67..3d27f4210 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/server.h
+++ b/libcockatrice_network/libcockatrice/network/server/remote/server.h
@@ -3,32 +3,30 @@
 
 #include "server_player_reference.h"
 
-#include <QList>
-#include <QMap>
 #include <QMultiMap>
 #include <QMutex>
-#include <QMutexLocker>
 #include <QObject>
 #include <QReadWriteLock>
-#include <QString>
-#include <QtGlobal>
-#include <qtmetamacros.h>
+#include <libcockatrice/protocol/pb/commands.pb.h>
+#include <libcockatrice/protocol/pb/serverinfo_ban.pb.h>
+#include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
 
 class Server_DatabaseInterface;
+class Server_Game;
 class Server_Room;
 class Server_ProtocolHandler;
 class Server_AbstractUserInterface;
+class GameReplay;
 class IslMessage;
 class SessionEvent;
 class RoomEvent;
+class DeckList;
 class ServerInfo_Game;
 class ServerInfo_Room;
 class Response;
 class GameEventContainer;
 class CommandContainer;
 class Command_JoinGame;
-class QThread;
-class ServerInfo_User;
 
 enum AuthenticationResult
 {
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/server_abstractuserinterface.cpp b/libcockatrice_network/libcockatrice/network/server/remote/server_abstractuserinterface.cpp
index 25aa415fc..31fa13d81 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/server_abstractuserinterface.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/remote/server_abstractuserinterface.cpp
@@ -1,13 +1,7 @@
 #include "server_abstractuserinterface.h"
 
-#include "game/server_abstract_participant.h"
 #include "game/server_game.h"
-#include "libcockatrice/protocol/pb/game_event_container.pb.h"
-#include "libcockatrice/protocol/pb/response.pb.h"
-#include "libcockatrice/protocol/pb/room_event.pb.h"
-#include "libcockatrice/protocol/pb/server_message.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_user.pb.h"
-#include "libcockatrice/protocol/pb/session_event.pb.h"
+#include "game/server_player.h"
 #include "server.h"
 #include "server_player_reference.h"
 #include "server_response_containers.h"
@@ -15,13 +9,8 @@
 
 #include <QDebug>
 #include <QList>
-#include <QReadLocker>
-#include <QReadWriteLock>
-#include <QString>
 #include <google/protobuf/descriptor.h>
-#include <google/protobuf/message.h>
-#include <qlogging.h>
-#include <utility>
+#include <libcockatrice/protocol/pb/event_game_joined.pb.h>
 
 void Server_AbstractUserInterface::sendProtocolItemByType(ServerMessage::MessageType type,
                                                           const ::google::protobuf::Message &item)
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/server_abstractuserinterface.h b/libcockatrice_network/libcockatrice/network/server/remote/server_abstractuserinterface.h
index a19475e34..2da72c01d 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/server_abstractuserinterface.h
+++ b/libcockatrice_network/libcockatrice/network/server/remote/server_abstractuserinterface.h
@@ -5,8 +5,6 @@
 
 #include <QMap>
 #include <QMutex>
-#include <QMutexLocker>
-#include <QPair>
 #include <libcockatrice/protocol/pb/response.pb.h>
 #include <libcockatrice/protocol/pb/server_message.pb.h>
 
@@ -14,15 +12,9 @@ class SessionEvent;
 class GameEventContainer;
 class RoomEvent;
 class ResponseContainer;
+
 class Server;
 class Server_Game;
-namespace google
-{
-namespace protobuf
-{
-class Message;
-} // namespace protobuf
-} // namespace google
 
 class Server_AbstractUserInterface : public ServerInfo_User_Container
 {
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/server_database_interface.h b/libcockatrice_network/libcockatrice/network/server/remote/server_database_interface.h
index e0be7990b..1e4fc990b 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/server_database_interface.h
+++ b/libcockatrice_network/libcockatrice/network/server/remote/server_database_interface.h
@@ -1,22 +1,9 @@
 #ifndef SERVER_DATABASE_INTERFACE_H
 #define SERVER_DATABASE_INTERFACE_H
 
-#include "libcockatrice/protocol/pb/serverinfo_user.pb.h"
 #include "server.h"
 
-#include <QMap>
 #include <QObject>
-#include <QString>
-#include <QStringList>
-#include <QtGlobal>
-#include <qtmetamacros.h>
-
-class DeckList;
-class GameReplay;
-class ServerInfo_Game;
-class Server_ProtocolHandler;
-template <typename T> class QList;
-template <typename T> class QSet;
 
 class Server_DatabaseInterface : public QObject
 {
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.cpp b/libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.cpp
index fc5cfa148..8422d703d 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.cpp
@@ -1,43 +1,20 @@
 #include "server_protocolhandler.h"
 
 #include "game/game_config.h"
-#include "game/server_abstract_participant.h"
 #include "game/server_game.h"
-#include "libcockatrice/protocol/pb/admin_commands.pb.h"
-#include "libcockatrice/protocol/pb/developer_commands.pb.h"
-#include "libcockatrice/protocol/pb/game_commands.pb.h"
-#include "libcockatrice/protocol/pb/game_event_container.pb.h"
-#include "libcockatrice/protocol/pb/moderator_commands.pb.h"
-#include "libcockatrice/protocol/pb/room_commands.pb.h"
-#include "libcockatrice/protocol/pb/room_event.pb.h"
-#include "libcockatrice/protocol/pb/server_message.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_chat_message.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_game.pb.h"
-#include "libcockatrice/protocol/pb/session_commands.pb.h"
-#include "libcockatrice/protocol/pb/session_event.pb.h"
+#include "game/server_player.h"
 #include "server_database_interface.h"
-#include "server_response_containers.h"
 #include "server_room.h"
-#include "serverinfo_user_container.h"
 
-#include <QChar>
 #include <QDateTime>
 #include <QDebug>
-#include <QListIterator>
-#include <QMapIterator>
-#include <QMutexLocker>
-#include <QPair>
-#include <QReadLocker>
-#include <QReadWriteLock>
-#include <QRecursiveMutex>
-#include <QSharedPointer>
-#include <QtGlobal>
 #include <QtMath>
-#include <google/protobuf/repeated_ptr_field.h>
+#include <google/protobuf/descriptor.h>
 #include <libcockatrice/protocol/debug_pb_message.h>
 #include <libcockatrice/protocol/featureset.h>
 #include <libcockatrice/protocol/get_pb_extension.h>
 #include <libcockatrice/protocol/pb/commands.pb.h>
+#include <libcockatrice/protocol/pb/event_game_joined.pb.h>
 #include <libcockatrice/protocol/pb/event_list_rooms.pb.h>
 #include <libcockatrice/protocol/pb/event_notify_user.pb.h>
 #include <libcockatrice/protocol/pb/event_room_say.pb.h>
@@ -51,9 +28,6 @@
 #include <libcockatrice/protocol/pb/response_login.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
 #include <libcockatrice/utility/string_limits.h>
-#include <qlogging.h>
-#include <string>
-#include <utility>
 
 Server_ProtocolHandler::Server_ProtocolHandler(Server *_server,
                                                Server_DatabaseInterface *_databaseInterface,
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.h b/libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.h
index a12706757..2c8efe50e 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.h
+++ b/libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.h
@@ -4,24 +4,34 @@
 #include "server.h"
 #include "server_abstractuserinterface.h"
 
-#include <QList>
-#include <QMap>
 #include <QObject>
-#include <QString>
 #include <libcockatrice/protocol/pb/response.pb.h>
-#include <qtmetamacros.h>
+#include <libcockatrice/protocol/pb/server_message.pb.h>
 
+class Features;
 class Server_DatabaseInterface;
+class Server_Player;
+class ServerInfo_User;
 class Server_Room;
+class QTimer;
+class FeatureSet;
+
 class ServerMessage;
+class Response;
+class SessionEvent;
+class GameEventContainer;
+class RoomEvent;
 class ResponseContainer;
+
 class CommandContainer;
 class SessionCommand;
 class ModeratorCommand;
 class AdminCommand;
 class DeveloperCommand;
+
 class Command_Ping;
 class Command_Login;
+class Command_Register;
 class Command_Message;
 class Command_ListUsers;
 class Command_GetGamesOfUser;
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/server_remoteuserinterface.h b/libcockatrice_network/libcockatrice/network/server/remote/server_remoteuserinterface.h
index 3bdf04220..d68656b9d 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/server_remoteuserinterface.h
+++ b/libcockatrice_network/libcockatrice/network/server/remote/server_remoteuserinterface.h
@@ -3,9 +3,6 @@
 
 #include "server_abstractuserinterface.h"
 
-class Server;
-class ServerInfo_User_Container;
-
 class Server_RemoteUserInterface : public Server_AbstractUserInterface
 {
 public:
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/server_response_containers.cpp b/libcockatrice_network/libcockatrice/network/server/remote/server_response_containers.cpp
index 4c4f351c9..22fb199fb 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/server_response_containers.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/remote/server_response_containers.cpp
@@ -1,13 +1,8 @@
 #include "server_response_containers.h"
 
 #include "game/server_game.h"
-#include "libcockatrice/protocol/pb/game_event.pb.h"
-#include "libcockatrice/protocol/pb/game_event_container.pb.h"
-#include "libcockatrice/protocol/pb/game_event_context.pb.h"
 
 #include <google/protobuf/descriptor.h>
-#include <google/protobuf/message.h>
-#include <utility>
 
 GameEventStorageItem::GameEventStorageItem(const ::google::protobuf::Message &_event,
                                            int _playerId,
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/server_response_containers.h b/libcockatrice_network/libcockatrice/network/server/remote/server_response_containers.h
index 32b7a80a2..118b32d38 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/server_response_containers.h
+++ b/libcockatrice_network/libcockatrice/network/server/remote/server_response_containers.h
@@ -1,14 +1,10 @@
 #ifndef SERVER_RESPONSE_CONTAINERS_H
 #define SERVER_RESPONSE_CONTAINERS_H
 
-#include <QFlags>
 #include <QList>
 #include <QPair>
-#include <algorithm>
 #include <libcockatrice/protocol/pb/server_message.pb.h>
 
-class GameEvent;
-
 namespace google
 {
 namespace protobuf
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/server_room.cpp b/libcockatrice_network/libcockatrice/network/server/remote/server_room.cpp
index 614de8d63..1f29e62fb 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/server_room.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/remote/server_room.cpp
@@ -1,26 +1,11 @@
 #include "server_room.h"
 
 #include "game/server_game.h"
-#include "libcockatrice/protocol/pb/response.pb.h"
-#include "libcockatrice/protocol/pb/room_event.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_game.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_gametype.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_user.pb.h"
-#include "server.h"
-#include "server_abstractuserinterface.h"
 #include "server_protocolhandler.h"
-#include "server_response_containers.h"
-#include "serverinfo_user_container.h"
 
 #include <QDateTime>
-#include <QMapIterator>
-#include <QMutexLocker>
-#include <QReadLocker>
-#include <QRecursiveMutex>
-#include <QSharedPointer>
+#include <QDebug>
 #include <google/protobuf/descriptor.h>
-#include <google/protobuf/message.h>
-#include <iterator>
 #include <libcockatrice/protocol/pb/commands.pb.h>
 #include <libcockatrice/protocol/pb/event_join_room.pb.h>
 #include <libcockatrice/protocol/pb/event_leave_room.pb.h>
@@ -31,10 +16,6 @@
 #include <libcockatrice/protocol/pb/serverinfo_chat_message.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_room.pb.h>
 #include <libcockatrice/utility/string_limits.h>
-#include <qlogging.h>
-#include <qnamespace.h>
-#include <string>
-#include <utility>
 
 Server_Room::Server_Room(int _id,
                          int _chatHistorySize,
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/server_room.h b/libcockatrice_network/libcockatrice/network/server/remote/server_room.h
index 5933894d5..3d9988f20 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/server_room.h
+++ b/libcockatrice_network/libcockatrice/network/server/remote/server_room.h
@@ -1,16 +1,16 @@
 #ifndef SERVER_ROOM_H
 #define SERVER_ROOM_H
 
-#include <QList>
+#include "serverinfo_user_container.h"
+
 #include <QMap>
+#include <QMutex>
 #include <QObject>
 #include <QReadWriteLock>
-#include <QString>
-#include <QStringList>
 #include <libcockatrice/protocol/pb/response.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_chat_message.pb.h>
-#include <qtmetamacros.h>
 
+class Server_DatabaseInterface;
 class Server_ProtocolHandler;
 class RoomEvent;
 class ServerInfo_User;
@@ -18,17 +18,10 @@ class ServerInfo_Room;
 class ServerInfo_Game;
 class Server_Game;
 class Server;
+
 class Command_JoinGame;
 class ResponseContainer;
 class Server_AbstractUserInterface;
-class ServerInfo_User_Container;
-namespace google
-{
-namespace protobuf
-{
-class Message;
-} // namespace protobuf
-} // namespace google
 
 class Server_Room : public QObject
 {
diff --git a/libcockatrice_protocol/CMakeLists.txt b/libcockatrice_protocol/CMakeLists.txt
index 55184045a..7dc0a0360 100644
--- a/libcockatrice_protocol/CMakeLists.txt
+++ b/libcockatrice_protocol/CMakeLists.txt
@@ -24,5 +24,3 @@ target_include_directories(
   libcockatrice_protocol PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
                                 ${CMAKE_CURRENT_BINARY_DIR} # points to the generated headers
 )
-
-target_precompile_headers(libcockatrice_protocol PRIVATE "${CMAKE_SOURCE_DIR}/cmake/pch/qtcore_pch.h")
diff --git a/libcockatrice_protocol/libcockatrice/protocol/debug_pb_message.cpp b/libcockatrice_protocol/libcockatrice/protocol/debug_pb_message.cpp
index f892c3f15..4d4889323 100644
--- a/libcockatrice_protocol/libcockatrice/protocol/debug_pb_message.cpp
+++ b/libcockatrice_protocol/libcockatrice/protocol/debug_pb_message.cpp
@@ -1,13 +1,11 @@
 #include "debug_pb_message.h"
 
+#include <QList>
 #include <QString>
 #include <google/protobuf/descriptor.h>
 #include <google/protobuf/message.h>
-#include <google/protobuf/stubs/common.h>
 #include <google/protobuf/text_format.h>
 #include <libcockatrice/utility/string_limits.h>
-#include <string>
-#include <vector>
 
 // FastFieldValuePrinter is added in protobuf 3.4, going out of our way to add the old FieldValuePrinter is not worth it
 #if GOOGLE_PROTOBUF_VERSION > 3004000
diff --git a/libcockatrice_protocol/libcockatrice/protocol/featureset.cpp b/libcockatrice_protocol/libcockatrice/protocol/featureset.cpp
index 0f8fd4210..3e687ef56 100644
--- a/libcockatrice_protocol/libcockatrice/protocol/featureset.cpp
+++ b/libcockatrice_protocol/libcockatrice/protocol/featureset.cpp
@@ -1,7 +1,6 @@
 #include "featureset.h"
 
 #include <QMap>
-#include <QSharedPointer>
 
 FeatureSet::FeatureSet()
 {
diff --git a/libcockatrice_protocol/libcockatrice/protocol/get_pb_extension.cpp b/libcockatrice_protocol/libcockatrice/protocol/get_pb_extension.cpp
index b9d2f18d0..a693ea5a7 100644
--- a/libcockatrice_protocol/libcockatrice/protocol/get_pb_extension.cpp
+++ b/libcockatrice_protocol/libcockatrice/protocol/get_pb_extension.cpp
@@ -2,7 +2,6 @@
 
 #include <google/protobuf/descriptor.h>
 #include <google/protobuf/message.h>
-#include <vector>
 
 int getPbExtension(const ::google::protobuf::Message &message)
 {
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/CMakeLists.txt b/libcockatrice_protocol/libcockatrice/protocol/pb/CMakeLists.txt
index 4e4f0e190..bc4814d5e 100644
--- a/libcockatrice_protocol/libcockatrice/protocol/pb/CMakeLists.txt
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/CMakeLists.txt
@@ -55,7 +55,6 @@ set(PROTO_FILES
     command_report_details.proto
     command_report_list.proto
     command_report_my_list.proto
-    command_report_reopen.proto
     command_report_resolve.proto
     command_report_stats.proto
     command_report_user_info.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_report_reopen.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_report_reopen.proto
deleted file mode 100644
index 1f9c707e8..000000000
--- a/libcockatrice_protocol/libcockatrice/protocol/pb/command_report_reopen.proto
+++ /dev/null
@@ -1,10 +0,0 @@
-syntax = "proto2";
-import "moderator_commands.proto";
-
-message Command_ReportReopen {
-    extend ModeratorCommand {
-        optional Command_ReportReopen ext = 1206;
-    }
-    required int32 report_id = 1;
-    optional string reopen_note = 2;
-}
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/moderator_commands.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/moderator_commands.proto
index 5298d3dad..4f1e80c27 100644
--- a/libcockatrice_protocol/libcockatrice/protocol/pb/moderator_commands.proto
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/moderator_commands.proto
@@ -26,7 +26,6 @@ message ModeratorCommand {
         REPLAY_DOWNLOAD_BY_GAME_ID = 1203;
         REPORT_USER_INFO = 1204;
         REPORT_STATS = 1205;
-        REPORT_REOPEN = 1206;
     }
     extensions 100 to max;
 }
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_report.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_report.proto
index 3b624cc6d..a145fd855 100644
--- a/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_report.proto
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_report.proto
@@ -33,7 +33,4 @@ message ServerInfo_Report {
     optional string chat_log = 14;
 
     optional string resolution_note = 15;
-    optional string resolved_by_name = 16;
-
-    optional int32 reported_user_level = 17;
 }
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pending_command.cpp b/libcockatrice_protocol/libcockatrice/protocol/pending_command.cpp
index 4a23fb6ef..62d35313e 100644
--- a/libcockatrice_protocol/libcockatrice/protocol/pending_command.cpp
+++ b/libcockatrice_protocol/libcockatrice/protocol/pending_command.cpp
@@ -1,8 +1,5 @@
 #include "pending_command.h"
 
-class CommandContainer;
-class Response;
-
 PendingCommand::PendingCommand(const CommandContainer &_commandContainer, QVariant _extraData)
     : commandContainer(_commandContainer), extraData(_extraData), ticks(0)
 {
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pending_command.h b/libcockatrice_protocol/libcockatrice/protocol/pending_command.h
index 9ed8a863c..b8f861d08 100644
--- a/libcockatrice_protocol/libcockatrice/protocol/pending_command.h
+++ b/libcockatrice_protocol/libcockatrice/protocol/pending_command.h
@@ -8,13 +8,9 @@
 #define PENDING_COMMAND_H
 
 #include <QElapsedTimer>
-#include <QObject>
 #include <QVariant>
-#include <QtGlobal>
 #include <libcockatrice/protocol/pb/commands.pb.h>
-#include <qtmetamacros.h>
-
-class Response;
+#include <libcockatrice/protocol/pb/response.pb.h>
 
 class PendingCommand : public QObject
 {
diff --git a/libcockatrice_rng/CMakeLists.txt b/libcockatrice_rng/CMakeLists.txt
index 6128e3f6e..b988c9d2f 100644
--- a/libcockatrice_rng/CMakeLists.txt
+++ b/libcockatrice_rng/CMakeLists.txt
@@ -11,10 +11,6 @@ add_library(
                            libcockatrice/rng/sfmt/SFMT.c
 )
 
-# SFMT is vendored and its own headers trip UBSan's alignment and vptr checks.
-cockatrice_disable_sanitizers_for(libcockatrice/rng/sfmt/SFMT.c)
-cockatrice_disable_coverage_for(libcockatrice/rng/sfmt/SFMT.c)
-
 target_include_directories(libcockatrice_rng PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
 target_link_libraries(libcockatrice_rng PUBLIC ${QT_CORE_MODULE})
diff --git a/libcockatrice_rng/libcockatrice/rng/rng_abstract.cpp b/libcockatrice_rng/libcockatrice/rng/rng_abstract.cpp
index 34a778ca9..82404d351 100644
--- a/libcockatrice_rng/libcockatrice/rng/rng_abstract.cpp
+++ b/libcockatrice_rng/libcockatrice/rng/rng_abstract.cpp
@@ -1,8 +1,6 @@
 #include "rng_abstract.h"
 
 #include <QDebug>
-#include <QList>
-#include <qlogging.h>
 
 QVector<int> RNG_Abstract::makeNumbersVector(int n, int min, int max)
 {
diff --git a/libcockatrice_rng/libcockatrice/rng/rng_abstract.h b/libcockatrice_rng/libcockatrice/rng/rng_abstract.h
index 49fb89612..903e6ef1a 100644
--- a/libcockatrice_rng/libcockatrice/rng/rng_abstract.h
+++ b/libcockatrice_rng/libcockatrice/rng/rng_abstract.h
@@ -3,7 +3,6 @@
 
 #include <QObject>
 #include <QVector>
-#include <qtmetamacros.h>
 
 class RNG_Abstract : public QObject
 {
diff --git a/libcockatrice_rng/libcockatrice/rng/rng_sfmt.cpp b/libcockatrice_rng/libcockatrice/rng/rng_sfmt.cpp
index 13e6fe680..4c578b4e4 100644
--- a/libcockatrice_rng/libcockatrice/rng/rng_sfmt.cpp
+++ b/libcockatrice_rng/libcockatrice/rng/rng_sfmt.cpp
@@ -1,13 +1,8 @@
 #include "rng_sfmt.h"
 
-#include "libcockatrice/rng/rng_abstract.h"
-#include "libcockatrice/rng/sfmt/SFMT.h"
-
-#include <QString>
+#include <algorithm>
+#include <climits>
 #include <stdexcept>
-#include <string>
-
-class QObject;
 
 // This is from gcc sources, namely from fixincludes/inclhack.def
 // On C++11 systems, <cstdint> could be included instead.
diff --git a/libcockatrice_rng/libcockatrice/rng/rng_sfmt.h b/libcockatrice_rng/libcockatrice/rng/rng_sfmt.h
index e178812ab..a180dad99 100644
--- a/libcockatrice_rng/libcockatrice/rng/rng_sfmt.h
+++ b/libcockatrice_rng/libcockatrice/rng/rng_sfmt.h
@@ -5,10 +5,7 @@
 #include "sfmt/SFMT.h"
 
 #include <QMutex>
-#include <qtmetamacros.h>
-#include <stdint.h>
-
-class QObject;
+#include <climits>
 
 /**
  * This class encapsulates a state of the art PRNG and can be used
diff --git a/libcockatrice_settings/CMakeLists.txt b/libcockatrice_settings/CMakeLists.txt
index 5a2fa42a9..80a465b6d 100644
--- a/libcockatrice_settings/CMakeLists.txt
+++ b/libcockatrice_settings/CMakeLists.txt
@@ -71,5 +71,3 @@ target_include_directories(
 )
 
 target_link_libraries(libcockatrice_settings PUBLIC libcockatrice_card libcockatrice_utility ${QT_CORE_MODULE})
-
-target_precompile_headers(libcockatrice_settings PRIVATE "${CMAKE_SOURCE_DIR}/cmake/pch/qtcore_pch.h")
diff --git a/libcockatrice_settings/libcockatrice/settings/appearance_settings.cpp b/libcockatrice_settings/libcockatrice/settings/appearance_settings.cpp
index 14969dae6..839e33be4 100644
--- a/libcockatrice_settings/libcockatrice/settings/appearance_settings.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/appearance_settings.cpp
@@ -1,11 +1,5 @@
 #include "appearance_settings.h"
 
-#include "libcockatrice/settings/settings_manager.h"
-
-#include <QVariant>
-
-class QObject;
-
 AppearanceSettings::AppearanceSettings(const QString &settingPath, QObject *parent)
     : SettingsManager(settingPath + "appearance.ini", "appearance", QString(), parent)
 {
diff --git a/libcockatrice_settings/libcockatrice/settings/appearance_settings.h b/libcockatrice_settings/libcockatrice/settings/appearance_settings.h
index 9d15caddd..a4504798e 100644
--- a/libcockatrice_settings/libcockatrice/settings/appearance_settings.h
+++ b/libcockatrice_settings/libcockatrice/settings/appearance_settings.h
@@ -9,11 +9,6 @@
 
 #include "settings_manager.h"
 
-#include <QString>
-#include <qtmetamacros.h>
-
-class QObject;
-
 class AppearanceSettings : public SettingsManager
 {
     Q_OBJECT
diff --git a/libcockatrice_settings/libcockatrice/settings/cache_storage_settings.cpp b/libcockatrice_settings/libcockatrice/settings/cache_storage_settings.cpp
index aaea87791..c800cc024 100644
--- a/libcockatrice_settings/libcockatrice/settings/cache_storage_settings.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/cache_storage_settings.cpp
@@ -1,11 +1,5 @@
 #include "cache_storage_settings.h"
 
-#include "libcockatrice/settings/settings_manager.h"
-
-#include <QVariant>
-
-class QObject;
-
 CacheStorageSettings::CacheStorageSettings(const QString &settingPath, QObject *parent)
     : SettingsManager(settingPath + "cache_storage.ini", "cache_storage", QString(), parent)
 {
diff --git a/libcockatrice_settings/libcockatrice/settings/cache_storage_settings.h b/libcockatrice_settings/libcockatrice/settings/cache_storage_settings.h
index a4c8a197d..4a4e73461 100644
--- a/libcockatrice_settings/libcockatrice/settings/cache_storage_settings.h
+++ b/libcockatrice_settings/libcockatrice/settings/cache_storage_settings.h
@@ -3,11 +3,7 @@
 
 #include "settings_manager.h"
 
-#include <QString>
 #include <libcockatrice/interfaces/interface_cache_storage_settings_provider.h>
-#include <qtmetamacros.h>
-
-class QObject;
 
 // In MB (Increments of 64)
 #define PIXMAPCACHE_SIZE_DEFAULT 2048
diff --git a/libcockatrice_settings/libcockatrice/settings/card_database_settings.cpp b/libcockatrice_settings/libcockatrice/settings/card_database_settings.cpp
index 49bcb042b..b55c97909 100644
--- a/libcockatrice_settings/libcockatrice/settings/card_database_settings.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/card_database_settings.cpp
@@ -1,16 +1,6 @@
 #include "card_database_settings.h"
 
-#include "libcockatrice/interfaces/interface_card_set_priority_controller.h"
-#include "libcockatrice/settings/settings_manager.h"
-
-#include <QList>
 #include <QMutexLocker>
-#include <QSettings>
-#include <QStringList>
-#include <QVariant>
-#include <functional>
-
-class QObject;
 
 CardDatabaseSettings::CardDatabaseSettings(const QString &settingPath, QObject *parent)
     : SettingsManager(settingPath + "cardDatabase.ini", QString(), QString(), parent)
@@ -88,20 +78,6 @@ ICardSetPriorityController::SetOptions CardDatabaseSettings::getSetOptions(QStri
     return setOptionsCache.value(shortName);
 }
 
-QStringList CardDatabaseSettings::getEnabledSetNames() const
-{
-    QMutexLocker lock(&setOptionsMutex);
-    ensureSetOptionsLoaded();
-    QStringList names;
-    for (auto it = setOptionsCache.constBegin(); it != setOptionsCache.constEnd(); ++it) {
-        if (it.value().enabled) {
-            names << it.key();
-        }
-    }
-    names.sort();
-    return names;
-}
-
 void CardDatabaseSettings::saveSets(const QVector<ICardSetPriorityController::SetSaveData> &data)
 {
     batchWrite([&](QSettings &s) {
@@ -110,7 +86,6 @@ void CardDatabaseSettings::saveSets(const QVector<ICardSetPriorityController::Se
             s.beginGroup(entry.shortName);
             s.setValue("sortKey", entry.sortKey);
             s.setValue("enabled", entry.enabled);
-            s.setValue("isKnown", entry.isKnown);
             s.endGroup();
         }
         s.endGroup();
@@ -122,6 +97,5 @@ void CardDatabaseSettings::saveSets(const QVector<ICardSetPriorityController::Se
         SetOptions &o = setOptionsCache[entry.shortName];
         o.sortKey = entry.sortKey;
         o.enabled = entry.enabled;
-        o.isKnown = entry.isKnown;
     }
-}
+}
\ No newline at end of file
diff --git a/libcockatrice_settings/libcockatrice/settings/card_database_settings.h b/libcockatrice_settings/libcockatrice/settings/card_database_settings.h
index 5bdf17aef..4553f197f 100644
--- a/libcockatrice_settings/libcockatrice/settings/card_database_settings.h
+++ b/libcockatrice_settings/libcockatrice/settings/card_database_settings.h
@@ -12,12 +12,7 @@
 
 #include <QHash>
 #include <QMutex>
-#include <QString>
-#include <QVector>
 #include <libcockatrice/interfaces/interface_card_set_priority_controller.h>
-#include <qtmetamacros.h>
-
-class QObject;
 
 class CardDatabaseSettings : public SettingsManager, public ICardSetPriorityController
 {
@@ -35,8 +30,6 @@ public:
 
     SetOptions getSetOptions(QString shortName) const override;
 
-    QStringList getEnabledSetNames() const override;
-
     void saveSets(const QVector<SetSaveData> &data) override;
 
 private:
diff --git a/libcockatrice_settings/libcockatrice/settings/card_override_settings.cpp b/libcockatrice_settings/libcockatrice/settings/card_override_settings.cpp
index 5a853a927..a61a4693b 100644
--- a/libcockatrice_settings/libcockatrice/settings/card_override_settings.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/card_override_settings.cpp
@@ -1,12 +1,5 @@
 #include "card_override_settings.h"
 
-#include "libcockatrice/settings/settings_manager.h"
-#include "libcockatrice/utility/card_ref.h"
-
-#include <QVariant>
-
-class QObject;
-
 CardOverrideSettings::CardOverrideSettings(const QString &settingPath, QObject *parent)
     : SettingsManager(settingPath + "cardPreferenceOverrides.ini", "cards", QString(), parent)
 {
diff --git a/libcockatrice_settings/libcockatrice/settings/card_override_settings.h b/libcockatrice_settings/libcockatrice/settings/card_override_settings.h
index a9e8b2d69..cd515d4da 100644
--- a/libcockatrice_settings/libcockatrice/settings/card_override_settings.h
+++ b/libcockatrice_settings/libcockatrice/settings/card_override_settings.h
@@ -9,11 +9,8 @@
 
 #include "settings_manager.h"
 
-#include <QString>
-#include <qtmetamacros.h>
-
-class QObject;
-struct CardRef;
+#include <QObject>
+#include <libcockatrice/utility/card_ref.h>
 
 class CardOverrideSettings : public SettingsManager
 {
diff --git a/libcockatrice_settings/libcockatrice/settings/cards_display_settings.cpp b/libcockatrice_settings/libcockatrice/settings/cards_display_settings.cpp
index f047973f0..3af607198 100644
--- a/libcockatrice_settings/libcockatrice/settings/cards_display_settings.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/cards_display_settings.cpp
@@ -1,13 +1,5 @@
 #include "cards_display_settings.h"
 
-#include "libcockatrice/card/card_localization.h"
-#include "libcockatrice/settings/settings_manager.h"
-
-#include <QSharedPointer>
-#include <QVariant>
-
-class QObject;
-
 CardsDisplaySettings::CardsDisplaySettings(const QString &settingPath, QObject *parent)
     : SettingsManager(settingPath + "cards_display.ini", "cards", QString(), parent)
 {
@@ -43,6 +35,11 @@ int CardsDisplaySettings::getPrintingSelectorCardSize() const
     return getValue("printingSelector", "cards", "cardSize", 100).toInt();
 }
 
+bool CardsDisplaySettings::getIncludeRebalancedCards() const
+{
+    return getValue("includerebalancedcards", QString(), QString(), true).toBool();
+}
+
 bool CardsDisplaySettings::getPrintingSelectorNavigationButtonsVisible() const
 {
     return getValue("navigationButtonsVisible", "cards", "printingSelector", true).toBool();
@@ -162,6 +159,15 @@ void CardsDisplaySettings::setPrintingSelectorCardSize(int _printingSelectorCard
     emit printingSelectorCardSizeChanged();
 }
 
+void CardsDisplaySettings::setIncludeRebalancedCards(bool _includeRebalancedCards)
+{
+    if (_includeRebalancedCards == getIncludeRebalancedCards()) {
+        return;
+    }
+    setValue(_includeRebalancedCards, "includerebalancedcards");
+    emit includeRebalancedCardsChanged(_includeRebalancedCards);
+}
+
 void CardsDisplaySettings::setPrintingSelectorNavigationButtonsVisible(bool _navigationButtonsVisible)
 {
     setValue(_navigationButtonsVisible, "navigationButtonsVisible", "cards", "printingSelector");
diff --git a/libcockatrice_settings/libcockatrice/settings/cards_display_settings.h b/libcockatrice_settings/libcockatrice/settings/cards_display_settings.h
index 961550d3c..77924d14c 100644
--- a/libcockatrice_settings/libcockatrice/settings/cards_display_settings.h
+++ b/libcockatrice_settings/libcockatrice/settings/cards_display_settings.h
@@ -3,11 +3,8 @@
 
 #include "settings_manager.h"
 
-#include <QString>
+#include <libcockatrice/card/card_localization.h>
 #include <libcockatrice/interfaces/interface_cards_display_settings_provider.h>
-#include <qtmetamacros.h>
-
-class QObject;
 
 class CardsDisplaySettings : public SettingsManager, public ICardsDisplaySettingsProvider
 {
@@ -21,6 +18,7 @@ public:
     [[nodiscard]] bool getBumpSetsWithCardsInDeckToTop() const override;
     [[nodiscard]] int getPrintingSelectorSortOrder() const override;
     [[nodiscard]] int getPrintingSelectorCardSize() const override;
+    [[nodiscard]] bool getIncludeRebalancedCards() const override;
     [[nodiscard]] bool getPrintingSelectorNavigationButtonsVisible() const override;
     [[nodiscard]] bool getTapAnimation() const override;
     [[nodiscard]] bool getArrowDrawAnimation() const override;
@@ -44,6 +42,7 @@ public:
     void setBumpSetsWithCardsInDeckToTop(bool _bumpSetsWithCardsInDeckToTop);
     void setPrintingSelectorSortOrder(int _printingSelectorSortOrder);
     void setPrintingSelectorCardSize(int _printingSelectorCardSize);
+    void setIncludeRebalancedCards(bool _includeRebalancedCards);
     void setPrintingSelectorNavigationButtonsVisible(bool _navigationButtonsVisible);
     void setTapAnimation(bool _tapAnimation);
     void setArrowDrawAnimation(bool _arrowDrawAnimation);
@@ -68,6 +67,7 @@ signals:
     void bumpSetsWithCardsInDeckToTopChanged();
     void printingSelectorSortOrderChanged();
     void printingSelectorCardSizeChanged();
+    void includeRebalancedCardsChanged(bool _includeRebalancedCards);
     void printingSelectorNavigationButtonsVisibleChanged();
     void visualDeckStorageCardSizeChanged();
     void visualDatabaseDisplayCardSizeChanged();
diff --git a/libcockatrice_settings/libcockatrice/settings/chat_settings.cpp b/libcockatrice_settings/libcockatrice/settings/chat_settings.cpp
index d9ae0ddac..0ee29b4f5 100644
--- a/libcockatrice_settings/libcockatrice/settings/chat_settings.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/chat_settings.cpp
@@ -1,11 +1,5 @@
 #include "chat_settings.h"
 
-#include "libcockatrice/settings/settings_manager.h"
-
-#include <QVariant>
-
-class QObject;
-
 ChatSettings::ChatSettings(const QString &settingPath, QObject *parent)
     : SettingsManager(settingPath + "chat.ini", "chat", QString(), parent)
 {
diff --git a/libcockatrice_settings/libcockatrice/settings/chat_settings.h b/libcockatrice_settings/libcockatrice/settings/chat_settings.h
index e00da4527..d928b23b7 100644
--- a/libcockatrice_settings/libcockatrice/settings/chat_settings.h
+++ b/libcockatrice_settings/libcockatrice/settings/chat_settings.h
@@ -3,11 +3,7 @@
 
 #include "settings_manager.h"
 
-#include <QString>
 #include <libcockatrice/interfaces/interface_chat_settings_provider.h>
-#include <qtmetamacros.h>
-
-class QObject;
 
 class ChatSettings : public SettingsManager, public IChatSettingsProvider
 {
diff --git a/libcockatrice_settings/libcockatrice/settings/commander_bracket_settings.cpp b/libcockatrice_settings/libcockatrice/settings/commander_bracket_settings.cpp
index eb692fe81..0c5f5521e 100644
--- a/libcockatrice_settings/libcockatrice/settings/commander_bracket_settings.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/commander_bracket_settings.cpp
@@ -1,16 +1,6 @@
 #include "commander_bracket_settings.h"
 
-#include "libcockatrice/settings/settings_manager.h"
-
-#include <QList>
-#include <QMap>
 #include <QSettings>
-#include <QStringList>
-#include <QVariant>
-#include <QVariantMap>
-#include <utility>
-
-class QObject;
 
 QVariantList CommanderBracketSettings::defaultDefinitions()
 {
diff --git a/libcockatrice_settings/libcockatrice/settings/commander_bracket_settings.h b/libcockatrice_settings/libcockatrice/settings/commander_bracket_settings.h
index ad012fc30..5a29f5dc7 100644
--- a/libcockatrice_settings/libcockatrice/settings/commander_bracket_settings.h
+++ b/libcockatrice_settings/libcockatrice/settings/commander_bracket_settings.h
@@ -4,11 +4,9 @@
 #include "settings_manager.h"
 
 #include <QHash>
+#include <QObject>
 #include <QString>
 #include <QVariantList>
-#include <qtmetamacros.h>
-
-class QObject;
 
 struct CommanderBracketDefinition
 {
diff --git a/libcockatrice_settings/libcockatrice/settings/debug_settings.cpp b/libcockatrice_settings/libcockatrice/settings/debug_settings.cpp
index c36e7187e..5bf6eca30 100644
--- a/libcockatrice_settings/libcockatrice/settings/debug_settings.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/debug_settings.cpp
@@ -1,11 +1,6 @@
 #include "debug_settings.h"
 
-#include "libcockatrice/settings/settings_manager.h"
-
-#include <QFile>
-#include <QVariant>
-
-class QObject;
+#include <QtCore/QFile>
 
 DebugSettings::DebugSettings(const QString &settingPath, QObject *parent)
     : SettingsManager(settingPath + "debug.ini", "debug", QString(), parent)
diff --git a/libcockatrice_settings/libcockatrice/settings/debug_settings.h b/libcockatrice_settings/libcockatrice/settings/debug_settings.h
index 9521a7738..acb5cf313 100644
--- a/libcockatrice_settings/libcockatrice/settings/debug_settings.h
+++ b/libcockatrice_settings/libcockatrice/settings/debug_settings.h
@@ -8,11 +8,6 @@
 #define DEBUG_SETTINGS_H
 #include "settings_manager.h"
 
-#include <QString>
-#include <qtmetamacros.h>
-
-class QObject;
-
 class DebugSettings : public SettingsManager
 {
     Q_OBJECT
diff --git a/libcockatrice_settings/libcockatrice/settings/deck_editor_settings.cpp b/libcockatrice_settings/libcockatrice/settings/deck_editor_settings.cpp
index ee570ed67..44cdcd86f 100644
--- a/libcockatrice_settings/libcockatrice/settings/deck_editor_settings.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/deck_editor_settings.cpp
@@ -1,11 +1,5 @@
 #include "deck_editor_settings.h"
 
-#include "libcockatrice/settings/settings_manager.h"
-
-#include <QVariant>
-
-class QObject;
-
 DeckEditorSettings::DeckEditorSettings(const QString &settingPath, QObject *parent)
     : SettingsManager(settingPath + "deck_editor.ini", "deckeditor", QString(), parent)
 {
diff --git a/libcockatrice_settings/libcockatrice/settings/deck_editor_settings.h b/libcockatrice_settings/libcockatrice/settings/deck_editor_settings.h
index aa024910d..0c87a270a 100644
--- a/libcockatrice_settings/libcockatrice/settings/deck_editor_settings.h
+++ b/libcockatrice_settings/libcockatrice/settings/deck_editor_settings.h
@@ -3,11 +3,7 @@
 
 #include "settings_manager.h"
 
-#include <QString>
 #include <libcockatrice/interfaces/interface_deck_editor_settings_provider.h>
-#include <qtmetamacros.h>
-
-class QObject;
 
 enum commanderSpellbookIntegrationEnabledIndex
 {
diff --git a/libcockatrice_settings/libcockatrice/settings/download_settings.cpp b/libcockatrice_settings/libcockatrice/settings/download_settings.cpp
index 84a6a7509..6e22a84f4 100644
--- a/libcockatrice_settings/libcockatrice/settings/download_settings.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/download_settings.cpp
@@ -2,14 +2,6 @@
 
 #include "settings_manager.h"
 
-#include <QList>
-#include <QSettings>
-#include <QVariant>
-#include <QtGlobal>
-#include <utility>
-
-class QObject;
-
 const QStringList DownloadSettings::DEFAULT_DOWNLOAD_URLS = {
     "https://cards.scryfall.io/large/!prop:side!/!set:uuid_substr_0_1!/!set:uuid_substr_1_1!/!set:uuid!.jpg",
     "https://api.scryfall.com/cards/!set:uuid!?format=image&face=!prop:side!&lang=!sflang!",
diff --git a/libcockatrice_settings/libcockatrice/settings/download_settings.h b/libcockatrice_settings/libcockatrice/settings/download_settings.h
index f7cf482e1..7eca77df6 100644
--- a/libcockatrice_settings/libcockatrice/settings/download_settings.h
+++ b/libcockatrice_settings/libcockatrice/settings/download_settings.h
@@ -10,11 +10,6 @@
 #include "settings_manager.h"
 
 #include <QHash>
-#include <QString>
-#include <QStringList>
-#include <qtmetamacros.h>
-
-class QObject;
 
 class DownloadSettings : public SettingsManager
 {
diff --git a/libcockatrice_settings/libcockatrice/settings/game_filters_settings.cpp b/libcockatrice_settings/libcockatrice/settings/game_filters_settings.cpp
index 79d1bc9e2..0edba44dd 100644
--- a/libcockatrice_settings/libcockatrice/settings/game_filters_settings.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/game_filters_settings.cpp
@@ -1,15 +1,7 @@
 #include "game_filters_settings.h"
 
-#include "libcockatrice/settings/settings_manager.h"
-
-#include <QByteArray>
 #include <QCryptographicHash>
-#include <QList>
-#include <QSharedPointer>
 #include <QTime>
-#include <QVariant>
-
-class QObject;
 
 GameFiltersSettings::GameFiltersSettings(const QString &settingPath, QObject *parent)
     : SettingsManager(settingPath + "gamefilters.ini", "filter_games", QString(), parent)
diff --git a/libcockatrice_settings/libcockatrice/settings/game_filters_settings.h b/libcockatrice_settings/libcockatrice/settings/game_filters_settings.h
index ec5e3fdc2..11480d483 100644
--- a/libcockatrice_settings/libcockatrice/settings/game_filters_settings.h
+++ b/libcockatrice_settings/libcockatrice/settings/game_filters_settings.h
@@ -10,13 +10,6 @@
 
 #include "settings_manager.h"
 
-#include <QString>
-#include <QStringList>
-#include <QTime>
-#include <qtmetamacros.h>
-
-class QObject;
-
 class GameFiltersSettings : public SettingsManager
 {
     Q_OBJECT
diff --git a/libcockatrice_settings/libcockatrice/settings/game_settings.cpp b/libcockatrice_settings/libcockatrice/settings/game_settings.cpp
index c8c6463e3..dfd67c98a 100644
--- a/libcockatrice_settings/libcockatrice/settings/game_settings.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/game_settings.cpp
@@ -1,11 +1,5 @@
 #include "game_settings.h"
 
-#include "libcockatrice/settings/settings_manager.h"
-
-#include <QVariant>
-
-class QObject;
-
 GameSettings::GameSettings(const QString &settingPath, QObject *parent)
     : SettingsManager(settingPath + "game.ini", QString(), QString(), parent)
 {
diff --git a/libcockatrice_settings/libcockatrice/settings/game_settings.h b/libcockatrice_settings/libcockatrice/settings/game_settings.h
index 3e64234fc..e0a484bac 100644
--- a/libcockatrice_settings/libcockatrice/settings/game_settings.h
+++ b/libcockatrice_settings/libcockatrice/settings/game_settings.h
@@ -3,11 +3,7 @@
 
 #include "settings_manager.h"
 
-#include <QString>
 #include <libcockatrice/interfaces/interface_game_settings_provider.h>
-#include <qtmetamacros.h>
-
-class QObject;
 
 class GameSettings : public SettingsManager, public IGameSettingsProvider
 {
diff --git a/libcockatrice_settings/libcockatrice/settings/interface_settings.cpp b/libcockatrice_settings/libcockatrice/settings/interface_settings.cpp
index 256d9eb26..b92a5fdec 100644
--- a/libcockatrice_settings/libcockatrice/settings/interface_settings.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/interface_settings.cpp
@@ -1,16 +1,5 @@
 #include "interface_settings.h"
 
-#include "libcockatrice/settings/settings_manager.h"
-#include "libcockatrice/utility/card_ref.h"
-#include "libcockatrice/utility/playmat_params.h"
-
-#include <QChar>
-#include <QList>
-#include <QVariant>
-#include <QtGlobal>
-
-class QObject;
-
 namespace
 {
 const QChar PLAYMAT_FIELD_SEP = QChar(0x1F); ///< Separator between PlaymatInfo fields.
@@ -48,7 +37,7 @@ InterfaceSettings::InterfaceSettings(const QString &settingPath, QObject *parent
 
 bool InterfaceSettings::getUseTearOffMenus() const
 {
-    return getValue("useTearOffMenus", QString(), QString(), false).toBool();
+    return getValue("useTearOffMenus", QString(), QString(), true).toBool();
 }
 
 int InterfaceSettings::getCardViewInitialRowsMax() const
diff --git a/libcockatrice_settings/libcockatrice/settings/interface_settings.h b/libcockatrice_settings/libcockatrice/settings/interface_settings.h
index 41bb6ee17..6b226f307 100644
--- a/libcockatrice_settings/libcockatrice/settings/interface_settings.h
+++ b/libcockatrice_settings/libcockatrice/settings/interface_settings.h
@@ -3,15 +3,7 @@
 
 #include "settings_manager.h"
 
-#include <QString>
-#include <QStringList>
-#include <QtGlobal>
 #include <libcockatrice/interfaces/interface_interface_settings_provider.h>
-#include <qtmetamacros.h>
-
-class QObject;
-struct PlaymatInfo;
-template <typename T> class QList;
 
 class InterfaceSettings : public SettingsManager, public IInterfaceSettingsProvider
 {
diff --git a/libcockatrice_settings/libcockatrice/settings/layouts_settings.cpp b/libcockatrice_settings/libcockatrice/settings/layouts_settings.cpp
index aba620026..e914dc2d8 100644
--- a/libcockatrice_settings/libcockatrice/settings/layouts_settings.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/layouts_settings.cpp
@@ -1,11 +1,5 @@
 #include "layouts_settings.h"
 
-#include "libcockatrice/settings/settings_manager.h"
-
-#include <QVariant>
-
-class QObject;
-
 const static QString STATE_PROP = "state";
 const static QString GEOMETRY_PROP = "geometry";
 const static QString SIZE_PROP = "widgetSize";
diff --git a/libcockatrice_settings/libcockatrice/settings/layouts_settings.h b/libcockatrice_settings/libcockatrice/settings/layouts_settings.h
index 91b0a2ea6..d5f26b61b 100644
--- a/libcockatrice_settings/libcockatrice/settings/layouts_settings.h
+++ b/libcockatrice_settings/libcockatrice/settings/layouts_settings.h
@@ -9,11 +9,7 @@
 
 #include "settings_manager.h"
 
-#include <QByteArray>
-#include <QString>
-#include <qtmetamacros.h>
-
-class QObject;
+#include <QSize>
 
 class LayoutsSettings : public SettingsManager
 {
diff --git a/libcockatrice_settings/libcockatrice/settings/message_settings.cpp b/libcockatrice_settings/libcockatrice/settings/message_settings.cpp
index ca77246ef..50da39df6 100644
--- a/libcockatrice_settings/libcockatrice/settings/message_settings.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/message_settings.cpp
@@ -1,11 +1,5 @@
 #include "message_settings.h"
 
-#include "libcockatrice/settings/settings_manager.h"
-
-#include <QVariant>
-
-class QObject;
-
 MessageSettings::MessageSettings(const QString &settingPath, QObject *parent)
     : SettingsManager(settingPath + "messages.ini", "messages", QString(), parent)
 {
diff --git a/libcockatrice_settings/libcockatrice/settings/message_settings.h b/libcockatrice_settings/libcockatrice/settings/message_settings.h
index 83513d562..8276aa39d 100644
--- a/libcockatrice_settings/libcockatrice/settings/message_settings.h
+++ b/libcockatrice_settings/libcockatrice/settings/message_settings.h
@@ -9,11 +9,6 @@
 
 #include "settings_manager.h"
 
-#include <QString>
-#include <qtmetamacros.h>
-
-class QObject;
-
 class MessageSettings : public SettingsManager
 {
     Q_OBJECT
diff --git a/libcockatrice_settings/libcockatrice/settings/network_settings.cpp b/libcockatrice_settings/libcockatrice/settings/network_settings.cpp
index 6d0fa9d1c..2d34d47ad 100644
--- a/libcockatrice_settings/libcockatrice/settings/network_settings.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/network_settings.cpp
@@ -1,11 +1,5 @@
 #include "network_settings.h"
 
-#include "libcockatrice/settings/settings_manager.h"
-
-#include <QVariant>
-
-class QObject;
-
 NetworkSettings::NetworkSettings(const QString &settingPath, QObject *parent)
     : SettingsManager(settingPath + "network.ini", "network", QString(), parent)
 {
diff --git a/libcockatrice_settings/libcockatrice/settings/network_settings.h b/libcockatrice_settings/libcockatrice/settings/network_settings.h
index 4367f9cb3..446bb51d3 100644
--- a/libcockatrice_settings/libcockatrice/settings/network_settings.h
+++ b/libcockatrice_settings/libcockatrice/settings/network_settings.h
@@ -9,11 +9,6 @@
 
 #include "settings_manager.h"
 
-#include <QString>
-#include <qtmetamacros.h>
-
-class QObject;
-
 class NetworkSettings : public SettingsManager
 {
     Q_OBJECT
diff --git a/libcockatrice_settings/libcockatrice/settings/paths_settings.cpp b/libcockatrice_settings/libcockatrice/settings/paths_settings.cpp
index 41ccf6460..67032e38f 100644
--- a/libcockatrice_settings/libcockatrice/settings/paths_settings.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/paths_settings.cpp
@@ -1,12 +1,7 @@
 #include "paths_settings.h"
 
-#include "libcockatrice/settings/settings_manager.h"
-
 #include <QDir>
-#include <QStringList>
-#include <QVariant>
-
-class QObject;
+#include <QFile>
 
 PathsSettings::PathsSettings(const QString &settingPath, QObject *parent)
     : SettingsManager(settingPath + "paths.ini", "paths", QString(), parent)
@@ -123,52 +118,3 @@ void PathsSettings::setSpoilerDatabasePath(const QString &_spoilerDatabasePath)
     setValue(_spoilerDatabasePath, "spoilerDatabase");
     emit cardDatabasePathChanged();
 }
-
-QStringList PathsSettings::pathsInsideDir(const QString &baseDir) const
-{
-    QStringList offenders;
-    const auto check = [&offenders, &baseDir](const QString &path) {
-        if (!path.isEmpty() && isInsideDir(path, baseDir)) {
-            offenders.append(QDir::cleanPath(path));
-        }
-    };
-
-    check(getDeckPath());
-    check(getFiltersPath());
-    check(getReplaysPath());
-    check(getPicsPath());
-    check(getCustomPicsPath());
-    check(getThemesPath());
-    check(getCardDatabasePath());
-    check(getCustomCardDatabasePath());
-    check(getTokenDatabasePath());
-    check(getSpoilerCardDatabasePath());
-    check(getRedirectCachePath());
-
-    offenders.removeDuplicates();
-    return offenders;
-}
-
-bool PathsSettings::isInsideDir(const QString &path, const QString &baseDir)
-{
-#if defined(Q_OS_WIN) || defined(Q_OS_MACOS)
-    // Windows and default macOS volumes are case-insensitive filesystems.
-    constexpr Qt::CaseSensitivity caseSensitivity = Qt::CaseInsensitive;
-#else
-    constexpr Qt::CaseSensitivity caseSensitivity = Qt::CaseSensitive;
-#endif
-    const QString base = QDir::cleanPath(baseDir);
-    const QString cleaned = QDir::cleanPath(path);
-    const QString prefix = base.endsWith(QLatin1Char('/')) ? base : base + QLatin1Char('/');
-    return cleaned == base || cleaned.startsWith(prefix, caseSensitivity);
-}
-
-bool PathsSettings::getAppDirWarningAcknowledged() const
-{
-    return getValue("appDirWarningAcknowledged").toBool();
-}
-
-void PathsSettings::setAppDirWarningAcknowledged(bool _appDirWarningAcknowledged)
-{
-    setValue(_appDirWarningAcknowledged, "appDirWarningAcknowledged");
-}
diff --git a/libcockatrice_settings/libcockatrice/settings/paths_settings.h b/libcockatrice_settings/libcockatrice/settings/paths_settings.h
index fa00428e3..ab1ea05c8 100644
--- a/libcockatrice_settings/libcockatrice/settings/paths_settings.h
+++ b/libcockatrice_settings/libcockatrice/settings/paths_settings.h
@@ -3,12 +3,7 @@
 
 #include "settings_manager.h"
 
-#include <QString>
-#include <QStringList>
 #include <libcockatrice/interfaces/interface_paths_settings_provider.h>
-#include <qtmetamacros.h>
-
-class QObject;
 
 class PathsSettings : public SettingsManager, public IPathsSettingsProvider
 {
@@ -28,24 +23,6 @@ public:
     [[nodiscard]] QString getSpoilerCardDatabasePath() const override;
     [[nodiscard]] QString getRedirectCachePath() const override;
 
-    /**
-     * @brief Returns the configured paths that resolve inside baseDir.
-     *
-     * Comparison is lexical (QDir::cleanPath); symlinks are not resolved, so a
-     * path that only reaches baseDir through a symlink is not reported.
-     */
-    [[nodiscard]] QStringList pathsInsideDir(const QString &baseDir) const;
-
-    /**
-     * @brief Whether path resolves inside baseDir, as a single-path check.
-     *
-     * A path counts as inside when it equals baseDir or is nested below it;
-     * a sibling sharing the name prefix (baseDir + "2") does not.
-     */
-    [[nodiscard]] static bool isInsideDir(const QString &path, const QString &baseDir);
-
-    [[nodiscard]] bool getAppDirWarningAcknowledged() const;
-
     void setDeckPath(const QString &_deckPath);
     void setFiltersPath(const QString &_filtersPath);
     void setReplaysPath(const QString &_replaysPath);
@@ -56,17 +33,14 @@ public:
     void setCustomCardDatabasePath(const QString &_customCardDatabasePath);
     void setTokenDatabasePath(const QString &_tokenDatabasePath);
     void setSpoilerDatabasePath(const QString &_spoilerDatabasePath);
-    void setAppDirWarningAcknowledged(bool _appDirWarningAcknowledged);
 
 signals:
     void cardDatabasePathChanged();
     void picsPathChanged();
     void themeChanged();
 
-public:
-    explicit PathsSettings(const QString &settingPath, QObject *parent = nullptr);
-
 private:
+    explicit PathsSettings(const QString &settingPath, QObject *parent = nullptr);
     PathsSettings(const PathsSettings & /*other*/);
 };
 
diff --git a/libcockatrice_settings/libcockatrice/settings/personal_settings.cpp b/libcockatrice_settings/libcockatrice/settings/personal_settings.cpp
index 682144485..d1cb74d09 100644
--- a/libcockatrice_settings/libcockatrice/settings/personal_settings.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/personal_settings.cpp
@@ -1,12 +1,5 @@
 #include "personal_settings.h"
 
-#include "libcockatrice/settings/settings_manager.h"
-
-#include <QList>
-#include <QVariant>
-
-class QObject;
-
 PersonalSettings::PersonalSettings(const QString &settingPath, QObject *parent)
     : SettingsManager(settingPath + "personal.ini", "personal", QString(), parent)
 {
diff --git a/libcockatrice_settings/libcockatrice/settings/personal_settings.h b/libcockatrice_settings/libcockatrice/settings/personal_settings.h
index 0819af41b..04eab2a8a 100644
--- a/libcockatrice_settings/libcockatrice/settings/personal_settings.h
+++ b/libcockatrice_settings/libcockatrice/settings/personal_settings.h
@@ -3,12 +3,9 @@
 
 #include "settings_manager.h"
 
-#include <QString>
+#include <QDate>
+#include <QList>
 #include <libcockatrice/interfaces/interface_personal_settings_provider.h>
-#include <qtmetamacros.h>
-
-class QObject;
-template <typename T> class QList;
 
 class PersonalSettings : public SettingsManager, public IPersonalSettingsProvider
 {
diff --git a/libcockatrice_settings/libcockatrice/settings/recents_settings.cpp b/libcockatrice_settings/libcockatrice/settings/recents_settings.cpp
index 4f2c06c88..5f16af179 100644
--- a/libcockatrice_settings/libcockatrice/settings/recents_settings.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/recents_settings.cpp
@@ -1,12 +1,5 @@
 #include "recents_settings.h"
 
-#include "libcockatrice/settings/settings_manager.h"
-
-#include <QList>
-#include <QVariant>
-
-class QObject;
-
 #define MAX_RECENT_DECK_COUNT 10
 
 RecentsSettings::RecentsSettings(const QString &settingPath, QObject *parent)
diff --git a/libcockatrice_settings/libcockatrice/settings/recents_settings.h b/libcockatrice_settings/libcockatrice/settings/recents_settings.h
index dc5853908..01b2a37bc 100644
--- a/libcockatrice_settings/libcockatrice/settings/recents_settings.h
+++ b/libcockatrice_settings/libcockatrice/settings/recents_settings.h
@@ -9,12 +9,6 @@
 
 #include "settings_manager.h"
 
-#include <QString>
-#include <QStringList>
-#include <qtmetamacros.h>
-
-class QObject;
-
 class RecentsSettings : public SettingsManager
 {
     Q_OBJECT
diff --git a/libcockatrice_settings/libcockatrice/settings/servers_settings.cpp b/libcockatrice_settings/libcockatrice/settings/servers_settings.cpp
index c5c4b2592..436e260c5 100644
--- a/libcockatrice_settings/libcockatrice/settings/servers_settings.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/servers_settings.cpp
@@ -1,17 +1,8 @@
 #include "servers_settings.h"
 
-#include "libcockatrice/settings/settings_manager.h"
-
 #include <QDebug>
-#include <QList>
-#include <QMessageLogger>
-#include <QSharedPointer>
-#include <QVariant>
-#include <qnamespace.h>
 #include <utility>
 
-class QObject;
-
 ServersSettings::ServersSettings(const QString &settingPath, QObject *parent)
     : SettingsManager(settingPath + "servers.ini", "server", QString(), parent)
 {
diff --git a/libcockatrice_settings/libcockatrice/settings/servers_settings.h b/libcockatrice_settings/libcockatrice/settings/servers_settings.h
index 40648baa9..93651c813 100644
--- a/libcockatrice_settings/libcockatrice/settings/servers_settings.h
+++ b/libcockatrice_settings/libcockatrice/settings/servers_settings.h
@@ -10,12 +10,7 @@
 #include "settings_manager.h"
 
 #include <QLoggingCategory>
-#include <QString>
-#include <QStringList>
-#include <qtmetamacros.h>
-
-class QObject;
-
+#include <QObject>
 #define SERVERSETTINGS_DEFAULT_HOST "server.cockatrice.us"
 #define SERVERSETTINGS_DEFAULT_PORT "4748"
 
diff --git a/libcockatrice_settings/libcockatrice/settings/settings_manager.h b/libcockatrice_settings/libcockatrice/settings/settings_manager.h
index 8d3110106..3d3c95d3e 100644
--- a/libcockatrice_settings/libcockatrice/settings/settings_manager.h
+++ b/libcockatrice_settings/libcockatrice/settings/settings_manager.h
@@ -7,12 +7,9 @@
 #ifndef SETTINGSMANAGER_H
 #define SETTINGSMANAGER_H
 
-#include <QObject>
 #include <QSettings>
-#include <QString>
+#include <QStringList>
 #include <QVariant>
-#include <functional>
-#include <qtmetamacros.h>
 
 class SettingsManager : public QObject
 {
diff --git a/libcockatrice_settings/libcockatrice/settings/settings_migration.cpp b/libcockatrice_settings/libcockatrice/settings/settings_migration.cpp
index d9652cde3..c22bd3c02 100644
--- a/libcockatrice_settings/libcockatrice/settings/settings_migration.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/settings_migration.cpp
@@ -1,25 +1,15 @@
 #include "settings_migration.h"
 
-#include <QChar>
 #include <QDateTime>
-#include <QDebug>
 #include <QDir>
 #include <QDirIterator>
 #include <QFile>
 #include <QFileInfo>
-#include <QFileInfoList>
-#include <QFlags>
-#include <QList>
 #include <QLoggingCategory>
 #include <QMap>
-#include <QMessageLogger>
 #include <QSettings>
-#include <QSharedPointer>
 #include <QStringList>
-#include <QStringLiteral>
-#include <QVariant>
 #include <algorithm>
-#include <utility>
 
 inline Q_LOGGING_CATEGORY(SettingsMigrationLog, "settings_migration");
 
@@ -259,6 +249,7 @@ static void migrateCardsDisplaySettings(const QString &settingsPath, QSettings &
         {"cards/roundcardcorners", "cards/roundCardCorners"},
         {"cards/overrideallcardartwithpersonalpreference", "cards/overrideAllCardArtWithPersonalPreference"},
         {"cards/bumpsetswithcardsindecktotop", "cards/bumpSetsWithCardsInDeckToTop"},
+        {"cards/includerebalancedcards", "cards/includerebalancedcards"},
         {"cards/tapanimation", "cards/tapAnimation"},
         {"cards/autorotatesidewayslayoutcards", "cards/autoRotateSidewaysLayoutCards"},
         {"cards/scaleCards", "cards/scaleCards"},
@@ -570,15 +561,9 @@ static void migrateLegacySets(const QString &settingsPath)
     QSettings cardDbIni(settingsPath + "cardDatabase.ini", QSettings::IniFormat);
     for (const auto &shortName : groups) {
         legacySetting.beginGroup(shortName);
-        if (legacySetting.contains("sortkey")) {
-            cardDbIni.setValue("sets/" + shortName + "/sortKey", legacySetting.value("sortkey"));
-        }
-        if (legacySetting.contains("enabled")) {
-            cardDbIni.setValue("sets/" + shortName + "/enabled", legacySetting.value("enabled"));
-        }
-        if (legacySetting.contains("isknown")) {
-            cardDbIni.setValue("sets/" + shortName + "/isKnown", legacySetting.value("isknown"));
-        }
+        cardDbIni.setValue("sets/" + shortName + "/sortKey", legacySetting.value("sortkey"));
+        cardDbIni.setValue("sets/" + shortName + "/enabled", legacySetting.value("enabled"));
+        cardDbIni.setValue("sets/" + shortName + "/isKnown", legacySetting.value("isknown"));
         legacySetting.endGroup();
     }
     legacySetting.endGroup();
@@ -642,34 +627,6 @@ static void migrateLegacyMessages(const QString &settingsPath)
     legacySetting.endGroup();
 }
 
-/**
- * gamefilters.ini keys renamed to camelCase by #7084. Profiles that migrated from the legacy
- * native store before that rename still hold the old snake_case keys, which nothing reads
- * anymore, so their saved filters silently stopped loading.
- */
-static const QMap<QString, QString> &renamedGameFilterKeys()
-{
-    static const QMap<QString, QString> keyMap = {
-        {"hide_buddies_only_games", "hideBuddiesOnlyGames"},
-        {"hide_full_games", "hideFullGames"},
-        {"hide_games_that_started", "hideGamesThatStarted"},
-        {"hide_password_protected_games", "hidePasswordProtectedGames"},
-        {"hide_ignored_user_games", "hideIgnoredUserGames"},
-        {"hide_not_buddy_created_games", "hideNotBuddyCreatedGames"},
-        {"hide_open_decklist_games", "hideOpenDecklistGames"},
-        {"game_name_filter", "gameNameFilter"},
-        {"creator_name_filter", "hostNameFilter"},
-        {"min_players", "minPlayers"},
-        {"max_players", "maxPlayers"},
-        {"max_game_age_time", "maxGameAgeTime"},
-        {"show_only_if_spectators_can_watch", "showOnlyIfSpectatorsCanWatch"},
-        {"show_spectator_password_protected", "showSpectatorPasswordProtected"},
-        {"show_only_if_spectators_can_chat", "showOnlyIfSpectatorsCanChat"},
-        {"show_only_if_spectators_can_see_hands", "showOnlyIfSpectatorsCanSeeHands"},
-    };
-    return keyMap;
-}
-
 static void migrateLegacyGameFilters(const QString &settingsPath)
 {
     QSettings legacySetting;
@@ -680,7 +637,24 @@ static void migrateLegacyGameFilters(const QString &settingsPath)
         return;
     }
 
-    const QMap<QString, QString> &filterKeyMap = renamedGameFilterKeys();
+    const QMap<QString, QString> filterKeyMap = {
+        {"hide_buddies_only_games", "hideBuddiesOnlyGames"},
+        {"hide_full_games", "hideFullGames"},
+        {"hide_games_that_started", "hideGamesThatStarted"},
+        {"hide_password_protected_games", "hidePasswordProtectedGames"},
+        {"hide_ignored_user_games", "hideIgnoredUserGames"},
+        {"hide_not_buddy_created_games", "hideNotBuddyCreatedGames"},
+        {"hide_open_decklist_games", "hideOpenDecklistGames"},
+        {"game_name_filter", "gameNameFilter"},
+        {"creator_name_filter", "creatorNameFilter"},
+        {"min_players", "minPlayers"},
+        {"max_players", "maxPlayers"},
+        {"max_game_age_time", "maxGameAgeTime"},
+        {"show_only_if_spectators_can_watch", "showOnlyIfSpectatorsCanWatch"},
+        {"show_spectator_password_protected", "showSpectatorPasswordProtected"},
+        {"show_only_if_spectators_can_chat", "showOnlyIfSpectatorsCanChat"},
+        {"show_only_if_spectators_can_see_hands", "showOnlyIfSpectatorsCanSeeHands"},
+    };
 
     QSettings filtersIni(settingsPath + "gamefilters.ini", QSettings::IniFormat);
     for (auto it = filterKeyMap.constBegin(); it != filterKeyMap.constEnd(); ++it) {
@@ -697,68 +671,6 @@ static void migrateLegacyGameFilters(const QString &settingsPath)
     legacySetting.endGroup();
 }
 
-static const QString LEGACY_GAME_FILTERS_GAME_TYPE_PREFIX = QStringLiteral("filter_games/game_type/");
-static const QString GAME_FILTERS_GAME_TYPE_PREFIX = QStringLiteral("filter_games/gameType/");
-
-static bool gameFiltersCamelCaseMigrationPending(const QString &settingsPath)
-{
-    if (!QFile::exists(settingsPath + "gamefilters.ini")) {
-        return false;
-    }
-
-    QSettings filtersIni(settingsPath + "gamefilters.ini", QSettings::IniFormat);
-    const QMap<QString, QString> &keyMap = renamedGameFilterKeys();
-    for (auto it = keyMap.constBegin(); it != keyMap.constEnd(); ++it) {
-        if (filtersIni.contains("filter_games/" + it.key()) && !filtersIni.contains("filter_games/" + it.value())) {
-            return true;
-        }
-    }
-    // Orphaned by #7084, which migrated the legacy host-name filter to a key nothing reads.
-    if (filtersIni.contains("filter_games/creatorNameFilter") && !filtersIni.contains("filter_games/hostNameFilter")) {
-        return true;
-    }
-    for (const auto &key : filtersIni.allKeys()) {
-        if (key.startsWith(LEGACY_GAME_FILTERS_GAME_TYPE_PREFIX) &&
-            !filtersIni.contains(GAME_FILTERS_GAME_TYPE_PREFIX +
-                                 key.mid(LEGACY_GAME_FILTERS_GAME_TYPE_PREFIX.size()))) {
-            return true;
-        }
-    }
-    return false;
-}
-
-bool SettingsMigration::migrateGameFiltersToCamelCase(const QString &settingsPath)
-{
-    if (!gameFiltersCamelCaseMigrationPending(settingsPath)) {
-        return false;
-    }
-
-    QSettings filtersIni(settingsPath + "gamefilters.ini", QSettings::IniFormat);
-    const QMap<QString, QString> &keyMap = renamedGameFilterKeys();
-    for (auto it = keyMap.constBegin(); it != keyMap.constEnd(); ++it) {
-        const QString oldKey = "filter_games/" + it.key();
-        const QString newKey = "filter_games/" + it.value();
-        if (filtersIni.contains(oldKey) && !filtersIni.contains(newKey)) {
-            filtersIni.setValue(newKey, filtersIni.value(oldKey));
-        }
-    }
-    if (filtersIni.contains("filter_games/creatorNameFilter") && !filtersIni.contains("filter_games/hostNameFilter")) {
-        filtersIni.setValue("filter_games/hostNameFilter", filtersIni.value("filter_games/creatorNameFilter"));
-    }
-    for (const auto &key : filtersIni.allKeys()) {
-        if (key.startsWith(LEGACY_GAME_FILTERS_GAME_TYPE_PREFIX)) {
-            const QString newKey = GAME_FILTERS_GAME_TYPE_PREFIX + key.mid(LEGACY_GAME_FILTERS_GAME_TYPE_PREFIX.size());
-            if (!filtersIni.contains(newKey)) {
-                filtersIni.setValue(newKey, filtersIni.value(key));
-            }
-        }
-    }
-    // The old keys are deliberately kept: pre-#7084 builds still read them, so removing them
-    // would break downgrades, and nothing in the current code reads them anymore.
-    filtersIni.sync();
-    return true;
-}
-
 bool SettingsMigration::migrateLegacySettings(const QString &settingsPath)
 {
     QSettings personalIni(settingsPath + "personal.ini", QSettings::IniFormat);
@@ -817,10 +729,6 @@ bool SettingsMigration::isMigrationPending(const QString &settingsPath)
         return true;
     }
 
-    if (gameFiltersCamelCaseMigrationPending(settingsPath)) {
-        return true;
-    }
-
     QSettings personalIni(settingsPath + "personal.ini", QSettings::IniFormat);
     if (personalIni.value("migration/legacy_complete", false).toBool()) {
         return false;
diff --git a/libcockatrice_settings/libcockatrice/settings/settings_migration.h b/libcockatrice_settings/libcockatrice/settings/settings_migration.h
index 0a706af98..78f9c8a3f 100644
--- a/libcockatrice_settings/libcockatrice/settings/settings_migration.h
+++ b/libcockatrice_settings/libcockatrice/settings/settings_migration.h
@@ -9,15 +9,6 @@ public:
     static bool migrateSettingsFromGlobalIni(const QString &settingsPath);
     static bool migrateLegacySettings(const QString &settingsPath);
 
-    /**
-     * Moves pre-camelCase gamefilters.ini keys (snake_case, game_type/<hash>) to the camelCase
-     * keys used since #7084, for profiles that already migrated before that rename and therefore
-     * never pass through migrateLegacySettings again. Copies values only where the new key is
-     * absent, never deletes the old keys, and returns true when anything was copied. Idempotent,
-     * so it runs on every startup.
-     */
-    static bool migrateGameFiltersToCamelCase(const QString &settingsPath);
-
     /**
      * Returns true when at least one of the two migrations would still do work, i.e. when a
      * backup of the settings directory is worth taking before they run.
diff --git a/libcockatrice_settings/libcockatrice/settings/sound_settings.cpp b/libcockatrice_settings/libcockatrice/settings/sound_settings.cpp
index 5de7f9105..82b724a07 100644
--- a/libcockatrice_settings/libcockatrice/settings/sound_settings.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/sound_settings.cpp
@@ -1,11 +1,5 @@
 #include "sound_settings.h"
 
-#include "libcockatrice/settings/settings_manager.h"
-
-#include <QVariant>
-
-class QObject;
-
 SoundSettings::SoundSettings(const QString &settingPath, QObject *parent)
     : SettingsManager(settingPath + "sound.ini", "sound", QString(), parent)
 {
diff --git a/libcockatrice_settings/libcockatrice/settings/sound_settings.h b/libcockatrice_settings/libcockatrice/settings/sound_settings.h
index df6332cae..ffaed2a7c 100644
--- a/libcockatrice_settings/libcockatrice/settings/sound_settings.h
+++ b/libcockatrice_settings/libcockatrice/settings/sound_settings.h
@@ -3,11 +3,7 @@
 
 #include "settings_manager.h"
 
-#include <QString>
 #include <libcockatrice/interfaces/interface_sound_settings_provider.h>
-#include <qtmetamacros.h>
-
-class QObject;
 
 class SoundSettings : public SettingsManager, public ISoundSettingsProvider
 {
diff --git a/libcockatrice_settings/libcockatrice/settings/tabs_settings.cpp b/libcockatrice_settings/libcockatrice/settings/tabs_settings.cpp
index 7ed6c4433..cf5bfd81a 100644
--- a/libcockatrice_settings/libcockatrice/settings/tabs_settings.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/tabs_settings.cpp
@@ -1,12 +1,5 @@
 #include "tabs_settings.h"
 
-#include "libcockatrice/settings/settings_manager.h"
-
-#include <QSharedPointer>
-#include <QVariant>
-
-class QObject;
-
 TabsSettings::TabsSettings(const QString &settingPath, QObject *parent)
     : SettingsManager(settingPath + "tabs.ini", "tabs", QString(), parent)
 {
diff --git a/libcockatrice_settings/libcockatrice/settings/tabs_settings.h b/libcockatrice_settings/libcockatrice/settings/tabs_settings.h
index 5411a6721..eb78d311b 100644
--- a/libcockatrice_settings/libcockatrice/settings/tabs_settings.h
+++ b/libcockatrice_settings/libcockatrice/settings/tabs_settings.h
@@ -3,11 +3,7 @@
 
 #include "settings_manager.h"
 
-#include <QString>
 #include <libcockatrice/interfaces/interface_tabs_settings_provider.h>
-#include <qtmetamacros.h>
-
-class QObject;
 
 /**
  * @brief The tab the application selects after launch.
diff --git a/libcockatrice_settings/libcockatrice/settings/updates_settings.cpp b/libcockatrice_settings/libcockatrice/settings/updates_settings.cpp
index 9ea22ed7c..166bc0aa8 100644
--- a/libcockatrice_settings/libcockatrice/settings/updates_settings.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/updates_settings.cpp
@@ -1,13 +1,6 @@
 #include "updates_settings.h"
 
-#include "libcockatrice/settings/settings_manager.h"
-
-#include <QDate>
 #include <QDateTime>
-#include <QSharedPointer>
-#include <QVariant>
-
-class QObject;
 
 UpdatesSettings::UpdatesSettings(const QString &settingPath, QObject *parent)
     : SettingsManager(settingPath + "updates.ini", "updates", QString(), parent)
@@ -60,11 +53,6 @@ bool UpdatesSettings::getNotifyAboutNewVersion() const
     return getValue("newVersionNotification", QString(), QString(), true).toBool();
 }
 
-bool UpdatesSettings::getCardDatabaseUpdateTrayNotification() const
-{
-    return getValue("cardDatabaseUpdateTrayNotification", QString(), QString(), true).toBool();
-}
-
 int UpdatesSettings::getUpdateReleaseChannelIndex() const
 {
     return getValue("updateReleaseChannel", QString(), QString(), 0).toInt();
@@ -110,11 +98,6 @@ void UpdatesSettings::setNotifyAboutNewVersion(bool _notifyaboutnewversion)
     setValue(_notifyaboutnewversion, "newVersionNotification");
 }
 
-void UpdatesSettings::setCardDatabaseUpdateTrayNotification(bool value)
-{
-    setValue(value, "cardDatabaseUpdateTrayNotification");
-}
-
 void UpdatesSettings::setUpdateReleaseChannelIndex(int value)
 {
     setValue(value, "updateReleaseChannel");
diff --git a/libcockatrice_settings/libcockatrice/settings/updates_settings.h b/libcockatrice_settings/libcockatrice/settings/updates_settings.h
index 490dca14e..6df0f8ce4 100644
--- a/libcockatrice_settings/libcockatrice/settings/updates_settings.h
+++ b/libcockatrice_settings/libcockatrice/settings/updates_settings.h
@@ -3,12 +3,8 @@
 
 #include "settings_manager.h"
 
-#include <QString>
+#include <QDate>
 #include <libcockatrice/interfaces/interface_updates_settings_provider.h>
-#include <qtmetamacros.h>
-
-class QDate;
-class QObject;
 
 class UpdatesSettings : public SettingsManager, public IUpdatesSettingsProvider
 {
@@ -25,7 +21,6 @@ public:
     [[nodiscard]] bool getAlwaysEnableNewSets() const override;
     [[nodiscard]] bool getNotifyAboutUpdates() const override;
     [[nodiscard]] bool getNotifyAboutNewVersion() const override;
-    [[nodiscard]] bool getCardDatabaseUpdateTrayNotification() const;
     [[nodiscard]] int getUpdateReleaseChannelIndex() const override;
 
     void setCheckUpdatesOnStartup(bool value);
@@ -36,7 +31,6 @@ public:
     void setAlwaysEnableNewSets(bool value);
     void setNotifyAboutUpdates(bool _notifyaboutupdate);
     void setNotifyAboutNewVersion(bool _notifyaboutnewversion);
-    void setCardDatabaseUpdateTrayNotification(bool value);
     void setUpdateReleaseChannelIndex(int value);
 
 public:
diff --git a/libcockatrice_settings/libcockatrice/settings/visual_deck_storage_settings.cpp b/libcockatrice_settings/libcockatrice/settings/visual_deck_storage_settings.cpp
index 4667a278c..3320598d8 100644
--- a/libcockatrice_settings/libcockatrice/settings/visual_deck_storage_settings.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/visual_deck_storage_settings.cpp
@@ -1,12 +1,5 @@
 #include "visual_deck_storage_settings.h"
 
-#include "libcockatrice/settings/settings_manager.h"
-
-#include <QList>
-#include <QVariant>
-
-class QObject;
-
 namespace
 {
 QStringList defaultTags = {
diff --git a/libcockatrice_settings/libcockatrice/settings/visual_deck_storage_settings.h b/libcockatrice_settings/libcockatrice/settings/visual_deck_storage_settings.h
index 12b96fd8b..9bc9d4172 100644
--- a/libcockatrice_settings/libcockatrice/settings/visual_deck_storage_settings.h
+++ b/libcockatrice_settings/libcockatrice/settings/visual_deck_storage_settings.h
@@ -3,12 +3,8 @@
 
 #include "settings_manager.h"
 
-#include <QString>
 #include <QStringList>
 #include <libcockatrice/interfaces/interface_visual_deck_storage_settings_provider.h>
-#include <qtmetamacros.h>
-
-class QObject;
 
 class VisualDeckStorageSettings : public SettingsManager, public IVisualDeckStorageSettingsProvider
 {
diff --git a/libcockatrice_utility/CMakeLists.txt b/libcockatrice_utility/CMakeLists.txt
index 5e6fa986d..41f1bfa0f 100644
--- a/libcockatrice_utility/CMakeLists.txt
+++ b/libcockatrice_utility/CMakeLists.txt
@@ -22,7 +22,6 @@ set(UTILITY_HEADERS
     libcockatrice/utility/cryptoutil.h
     libcockatrice/utility/expression.h
     libcockatrice/utility/levenshtein.h
-    libcockatrice/utility/local_server_name.h
     libcockatrice/utility/macros.h
     libcockatrice/utility/passwordhasher.h
     libcockatrice/utility/playmat_params.h
@@ -49,5 +48,3 @@ target_link_libraries(libcockatrice_utility PUBLIC libcockatrice_rng OpenSSL::Cr
 set(ORACLE_LIBS)
 
 include_directories(${${COCKATRICE_QT_VERSION_NAME}Core_INCLUDE_DIRS})
-
-target_precompile_headers(libcockatrice_utility PRIVATE "${CMAKE_SOURCE_DIR}/cmake/pch/qtcore_pch.h")
diff --git a/libcockatrice_utility/libcockatrice/utility/cryptoutil.cpp b/libcockatrice_utility/libcockatrice/utility/cryptoutil.cpp
index fb59022de..416ef261b 100644
--- a/libcockatrice_utility/libcockatrice/utility/cryptoutil.cpp
+++ b/libcockatrice_utility/libcockatrice/utility/cryptoutil.cpp
@@ -1,7 +1,6 @@
 #include "cryptoutil.h"
 
 #include <openssl/rand.h>
-#include <qlogging.h>
 
 namespace CryptoUtil
 {
diff --git a/libcockatrice_utility/libcockatrice/utility/expression.cpp b/libcockatrice_utility/libcockatrice/utility/expression.cpp
index 85d1cdddc..718b0fe18 100644
--- a/libcockatrice_utility/libcockatrice/utility/expression.cpp
+++ b/libcockatrice_utility/libcockatrice/utility/expression.cpp
@@ -5,12 +5,7 @@
 #include <QByteArray>
 #include <QString>
 #include <QtMath>
-#include <cmath>
 #include <functional>
-#include <memory>
-#include <qnumeric.h>
-#include <string>
-#include <vector>
 
 peg::parser math(R"(
     EXPRESSION   <-  P0
diff --git a/libcockatrice_utility/libcockatrice/utility/levenshtein.cpp b/libcockatrice_utility/libcockatrice/utility/levenshtein.cpp
index f7d8459cb..f39d325fb 100644
--- a/libcockatrice_utility/libcockatrice/utility/levenshtein.cpp
+++ b/libcockatrice_utility/libcockatrice/utility/levenshtein.cpp
@@ -1,7 +1,5 @@
 #include "levenshtein.h"
 
-#include <QChar>
-#include <QSharedPointer>
 #include <algorithm>
 #include <vector>
 
diff --git a/libcockatrice_utility/libcockatrice/utility/local_server_name.h b/libcockatrice_utility/libcockatrice/utility/local_server_name.h
deleted file mode 100644
index a5797fba1..000000000
--- a/libcockatrice_utility/libcockatrice/utility/local_server_name.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifndef COCKATRICE_LOCAL_SERVER_NAME_H
-#define COCKATRICE_LOCAL_SERVER_NAME_H
-
-#include <QDir>
-#include <QString>
-#include <QtGlobal>
-
-/**
- * @brief Builds a QLocalServer/QLocalSocket name scoped to the current user.
- *
- * On Linux the default local socket namespace is system-wide, so an unscoped name
- * would let one user's process talk to — or hijack — another user's session.
- * @param prefix application specific socket name prefix
- * @return the scoped socket name
- */
-inline QString scopedLocalServerName(const QString &prefix)
-{
-    QString userName = qEnvironmentVariable("USER");
-    if (userName.isEmpty()) {
-        userName = qEnvironmentVariable("USERNAME");
-    }
-    if (userName.isEmpty()) {
-        userName = QDir::home().dirName();
-    }
-    return prefix + QLatin1Char('-') + userName;
-}
-
-#endif // COCKATRICE_LOCAL_SERVER_NAME_H
diff --git a/libcockatrice_utility/libcockatrice/utility/passwordhasher.cpp b/libcockatrice_utility/libcockatrice/utility/passwordhasher.cpp
index b4a412fa6..1c22fdcfa 100644
--- a/libcockatrice_utility/libcockatrice/utility/passwordhasher.cpp
+++ b/libcockatrice_utility/libcockatrice/utility/passwordhasher.cpp
@@ -1,7 +1,5 @@
 #include "passwordhasher.h"
 
-#include <QByteArray>
-#include <QChar>
 #include <QCryptographicHash>
 #include <libcockatrice/utility/cryptoutil.h>
 
diff --git a/libcockatrice_utility/libcockatrice/utility/passwordhasher.h b/libcockatrice_utility/libcockatrice/utility/passwordhasher.h
index 8ad83f089..811ecef15 100644
--- a/libcockatrice_utility/libcockatrice/utility/passwordhasher.h
+++ b/libcockatrice_utility/libcockatrice/utility/passwordhasher.h
@@ -1,7 +1,7 @@
 #ifndef PASSWORDHASHER_H
 #define PASSWORDHASHER_H
 
-#include <QString>
+#include <QObject>
 
 class PasswordHasher
 {
diff --git a/libcockatrice_utility/libcockatrice/utility/report_categories.cpp b/libcockatrice_utility/libcockatrice/utility/report_categories.cpp
index f3576d7fd..8551c1ca1 100644
--- a/libcockatrice_utility/libcockatrice/utility/report_categories.cpp
+++ b/libcockatrice_utility/libcockatrice/utility/report_categories.cpp
@@ -1,8 +1,5 @@
 #include "report_categories.h"
 
-#include <QList>
-#include <qnamespace.h>
-
 namespace ReportCategories
 {
 const QStringList &keys()
diff --git a/libcockatrice_utility/libcockatrice/utility/server_rate_limiter.cpp b/libcockatrice_utility/libcockatrice/utility/server_rate_limiter.cpp
index 50340c350..2a1e3b283 100644
--- a/libcockatrice_utility/libcockatrice/utility/server_rate_limiter.cpp
+++ b/libcockatrice_utility/libcockatrice/utility/server_rate_limiter.cpp
@@ -1,9 +1,5 @@
 #include "server_rate_limiter.h"
 
-#include <QSharedPointer>
-#include <QtGlobal>
-#include <compare>
-
 bool ServerRateLimiter::isRateLimited(const QString &host, const QDateTime &now) const
 {
     auto it = backoffUntil.constFind(host);
diff --git a/libcockatrice_utility/libcockatrice/utility/server_rate_limiter.h b/libcockatrice_utility/libcockatrice/utility/server_rate_limiter.h
index cae26983d..e071b9189 100644
--- a/libcockatrice_utility/libcockatrice/utility/server_rate_limiter.h
+++ b/libcockatrice_utility/libcockatrice/utility/server_rate_limiter.h
@@ -4,7 +4,6 @@
 #include <QDateTime>
 #include <QMap>
 #include <QString>
-#include <QtGlobal>
 
 /**
  * @class ServerRateLimiter
diff --git a/libcockatrice_utility/libcockatrice/utility/translation_loader.cpp b/libcockatrice_utility/libcockatrice/utility/translation_loader.cpp
index 41c6107b3..b06bcffc6 100644
--- a/libcockatrice_utility/libcockatrice/utility/translation_loader.cpp
+++ b/libcockatrice_utility/libcockatrice/utility/translation_loader.cpp
@@ -1,23 +1,13 @@
 #include "translation_loader.h"
 
-#include <QChar>
 #include <QCoreApplication>
-#include <QDebug>
 #include <QDir>
 #include <QFileInfo>
-#include <QLatin1Char>
 #include <QLibraryInfo>
-#include <QMessageLogger>
 #include <QRegularExpression>
-#include <QRegularExpressionMatch>
 #include <QSet>
-#include <QSharedPointer>
-#include <QStringList>
-#include <QStringLiteral>
 #include <QTranslator>
-#include <QtGlobal>
 #include <algorithm>
-#include <initializer_list>
 
 // Kept under the historical category name so existing QT_LOGGING_RULES filters keep working.
 Q_LOGGING_CATEGORY(TranslationLoaderLog, "qt_translator")
diff --git a/libcockatrice_utility/libcockatrice/utility/warning_categories.cpp b/libcockatrice_utility/libcockatrice/utility/warning_categories.cpp
index ad0fc86f0..b5ca563ff 100644
--- a/libcockatrice_utility/libcockatrice/utility/warning_categories.cpp
+++ b/libcockatrice_utility/libcockatrice/utility/warning_categories.cpp
@@ -1,9 +1,5 @@
 #include "warning_categories.h"
 
-#include <QChar>
-#include <QStringList>
-#include <qnamespace.h>
-
 QList<WarningCategory> parseWarningCategories(const QString &value)
 {
     QList<WarningCategory> categories;
diff --git a/oracle/CMakeLists.txt b/oracle/CMakeLists.txt
index 0df345812..0003b77ac 100644
--- a/oracle/CMakeLists.txt
+++ b/oracle/CMakeLists.txt
@@ -79,9 +79,6 @@ if(ZLIB_FOUND)
   include_directories(${ZLIB_INCLUDE_DIRS})
   add_definitions("-DHAS_ZLIB")
   list(APPEND oracle_SOURCES src/zip/unzip.cpp src/zip/zipglobal.cpp)
-  # minizip and zlib are vendored.
-  cockatrice_disable_sanitizers_for(src/zip/unzip.cpp src/zip/zipglobal.cpp)
-  cockatrice_disable_coverage_for(src/zip/unzip.cpp src/zip/zipglobal.cpp)
 else()
   message(STATUS "Oracle: zlib not found; ZIP support disabled")
 endif()
@@ -92,9 +89,6 @@ if(LIBLZMA_FOUND)
   include_directories(${LIBLZMA_INCLUDE_DIRS})
   add_definitions("-DHAS_LZMA")
   list(APPEND oracle_SOURCES src/lzma/decompress.cpp)
-  # The LZMA SDK is vendored.
-  cockatrice_disable_sanitizers_for(src/lzma/decompress.cpp)
-  cockatrice_disable_coverage_for(src/lzma/decompress.cpp)
 else()
   message(STATUS "Oracle: LibLZMA not found; xz support disabled")
 endif()
diff --git a/oracle/oracle_en@source.ts b/oracle/oracle_en@source.ts
index 09020f02c..b3263f861 100644
--- a/oracle/oracle_en@source.ts
+++ b/oracle/oracle_en@source.ts
@@ -4,22 +4,22 @@
 <context>
     <name>IntroPage</name>
     <message>
-        <location filename="src/pages.cpp" line="239"/>
+        <location filename="src/pages.cpp" line="127"/>
         <source>Introduction</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="240"/>
+        <location filename="src/pages.cpp" line="128"/>
         <source>This wizard will import the list of sets, cards, and tokens that will be used by Cockatrice.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="242"/>
+        <location filename="src/pages.cpp" line="130"/>
         <source>Interface language:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="243"/>
+        <location filename="src/pages.cpp" line="131"/>
         <source>Version:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -27,206 +27,192 @@
 <context>
     <name>LoadSetsPage</name>
     <message>
-        <location filename="src/pages.cpp" line="317"/>
+        <location filename="src/pages.cpp" line="200"/>
         <source>Source selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="318"/>
+        <location filename="src/pages.cpp" line="201"/>
         <source>Please specify a compatible source for the list of sets and cards. You can specify a URL address that will be downloaded or use an existing file from your computer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="322"/>
+        <location filename="src/pages.cpp" line="205"/>
         <source>Download URL:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="323"/>
+        <location filename="src/pages.cpp" line="206"/>
         <source>Local file:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="324"/>
+        <location filename="src/pages.cpp" line="207"/>
         <source>Restore default URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="325"/>
+        <location filename="src/pages.cpp" line="208"/>
         <source>Choose file...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="335"/>
+        <location filename="src/pages.cpp" line="218"/>
         <source>Load sets file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="345"/>
+        <location filename="src/pages.cpp" line="228"/>
         <source>Sets file (%1)</source>
         <oldsource>Sets JSON file (%1)</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="375"/>
-        <location filename="src/pages.cpp" line="394"/>
-        <location filename="src/pages.cpp" line="469"/>
-        <location filename="src/pages.cpp" line="604"/>
-        <location filename="src/pages.cpp" line="644"/>
+        <location filename="src/pages.cpp" line="258"/>
+        <location filename="src/pages.cpp" line="277"/>
+        <location filename="src/pages.cpp" line="282"/>
+        <location filename="src/pages.cpp" line="354"/>
+        <location filename="src/pages.cpp" line="485"/>
+        <location filename="src/pages.cpp" line="498"/>
+        <location filename="src/pages.cpp" line="519"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="375"/>
+        <location filename="src/pages.cpp" line="258"/>
         <source>The provided URL is not valid.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="394"/>
+        <location filename="src/pages.cpp" line="262"/>
+        <source>Downloading (0MB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="277"/>
         <source>Please choose a file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="576"/>
+        <location filename="src/pages.cpp" line="282"/>
         <source>Cannot open file &apos;%1&apos;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="469"/>
+        <location filename="src/pages.cpp" line="345"/>
+        <source>Downloading (%1MB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="354"/>
         <source>Network error: %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="524"/>
+        <location filename="src/pages.cpp" line="392"/>
         <source>Parsing file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="100"/>
+        <location filename="src/pages.cpp" line="414"/>
         <source>Xz extraction failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="108"/>
+        <location filename="src/pages.cpp" line="421"/>
         <source>Sorry, this version of Oracle does not support xz compressed files.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="120"/>
+        <location filename="src/pages.cpp" line="441"/>
         <source>Failed to open Zip archive: %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="126"/>
+        <location filename="src/pages.cpp" line="446"/>
         <source>Zip extraction failed: the Zip archive doesn&apos;t contain exactly one file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="137"/>
+        <location filename="src/pages.cpp" line="454"/>
         <source>Zip extraction failed: %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="144"/>
+        <location filename="src/pages.cpp" line="462"/>
         <source>Sorry, this version of Oracle does not support zipped files.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="164"/>
+        <location filename="src/pages.cpp" line="485"/>
         <source>Failed to interpret downloaded data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="379"/>
-        <source>Downloading (0 MB)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="460"/>
-        <source>Downloading (%1 MB)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="509"/>
-        <source>Parsing file (%1%)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="524"/>
-        <source>Extracting file...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="604"/>
+        <location filename="src/pages.cpp" line="498"/>
         <source>Do you want to download the uncompressed file instead?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="635"/>
-        <location filename="src/pages.cpp" line="657"/>
+        <location filename="src/pages.cpp" line="520"/>
         <source>The file was retrieved successfully, but it does not contain any sets data.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="src/pages.cpp" line="666"/>
-        <source>Parsing file (100%)</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>LoadSpoilersPage</name>
     <message>
-        <location filename="src/pages.cpp" line="952"/>
+        <location filename="src/pages.cpp" line="716"/>
         <source>Save spoiler database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="957"/>
+        <location filename="src/pages.cpp" line="721"/>
         <source>XML; spoiler database (*.xml)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="962"/>
+        <location filename="src/pages.cpp" line="726"/>
         <source>spoiler</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="967"/>
+        <location filename="src/pages.cpp" line="731"/>
         <source>Spoilers import</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="968"/>
+        <location filename="src/pages.cpp" line="732"/>
         <source>Please specify a compatible source for spoiler data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="970"/>
+        <location filename="src/pages.cpp" line="734"/>
         <source>Download URL:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="971"/>
+        <location filename="src/pages.cpp" line="735"/>
         <source>Local file:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="972"/>
+        <location filename="src/pages.cpp" line="736"/>
         <source>Restore default URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="973"/>
+        <location filename="src/pages.cpp" line="737"/>
         <source>Choose file...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="975"/>
+        <location filename="src/pages.cpp" line="739"/>
         <source>The spoiler database will be saved at the following location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="977"/>
+        <location filename="src/pages.cpp" line="741"/>
         <source>Save to a custom path (not recommended)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -234,57 +220,57 @@
 <context>
     <name>LoadTokensPage</name>
     <message>
-        <location filename="src/pages.cpp" line="907"/>
+        <location filename="src/pages.cpp" line="671"/>
         <source>Save token database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="912"/>
+        <location filename="src/pages.cpp" line="676"/>
         <source>XML; token database (*.xml)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="917"/>
+        <location filename="src/pages.cpp" line="681"/>
         <source>tokens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="922"/>
+        <location filename="src/pages.cpp" line="686"/>
         <source>Tokens import</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="923"/>
+        <location filename="src/pages.cpp" line="687"/>
         <source>Please specify a compatible source for token data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="925"/>
+        <location filename="src/pages.cpp" line="689"/>
         <source>Download URL:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="926"/>
+        <location filename="src/pages.cpp" line="690"/>
         <source>Local file:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="927"/>
+        <location filename="src/pages.cpp" line="691"/>
         <source>Restore default URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="928"/>
+        <location filename="src/pages.cpp" line="692"/>
         <source>Choose file...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="930"/>
+        <location filename="src/pages.cpp" line="694"/>
         <source>The token database will be saved at the following location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="932"/>
+        <location filename="src/pages.cpp" line="696"/>
         <source>Save to a custom path (not recommended)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -292,7 +278,7 @@
 <context>
     <name>OracleImporter</name>
     <message>
-        <location filename="src/oracleimporter.cpp" line="770"/>
+        <location filename="src/oracleimporter.cpp" line="542"/>
         <source>Dummy set containing tokens</source>
         <translation type="unfinished"></translation>
     </message>
@@ -300,7 +286,7 @@
 <context>
     <name>OracleWizard</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="106"/>
+        <location filename="src/oraclewizard.cpp" line="101"/>
         <source>Oracle Importer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -308,22 +294,22 @@
 <context>
     <name>OutroPage</name>
     <message>
-        <location filename="src/pages.cpp" line="248"/>
+        <location filename="src/pages.cpp" line="136"/>
         <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="249"/>
+        <location filename="src/pages.cpp" line="137"/>
         <source>The wizard has finished.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="250"/>
+        <location filename="src/pages.cpp" line="138"/>
         <source>You can now start using Cockatrice with the newly updated cards.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="251"/>
+        <location filename="src/pages.cpp" line="139"/>
         <source>If the card databases don&apos;t reload automatically, restart the Cockatrice client.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -331,76 +317,73 @@
 <context>
     <name>SaveSetsPage</name>
     <message>
-        <location filename="src/pages.cpp" line="789"/>
-        <location filename="src/pages.cpp" line="874"/>
+        <location filename="src/pages.cpp" line="563"/>
+        <location filename="src/pages.cpp" line="638"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="780"/>
-        <location filename="src/pages.cpp" line="789"/>
+        <location filename="src/pages.cpp" line="563"/>
         <source>No set has been imported.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="795"/>
+        <location filename="src/pages.cpp" line="574"/>
         <source>Sets imported</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="797"/>
-        <source>A Cockatrice card database file of %1 MB has been downloaded.</source>
+        <location filename="src/pages.cpp" line="576"/>
+        <source>A cockatrice database file of %1 MB has been downloaded.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="800"/>
+        <location filename="src/pages.cpp" line="579"/>
         <source>The following sets have been found:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="803"/>
+        <location filename="src/pages.cpp" line="582"/>
         <source>Press &quot;Save&quot; to store the imported cards in the Cockatrice database.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="804"/>
+        <location filename="src/pages.cpp" line="583"/>
         <source>The card database will be saved at the following location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="806"/>
+        <location filename="src/pages.cpp" line="585"/>
         <source>Save to a custom path (not recommended)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="808"/>
+        <location filename="src/pages.cpp" line="587"/>
         <source>&amp;Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="820"/>
-        <location filename="src/pages.cpp" line="823"/>
+        <location filename="src/pages.cpp" line="593"/>
         <source>Import finished: %1 cards.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="828"/>
-        <location filename="src/pages.cpp" line="831"/>
+        <location filename="src/pages.cpp" line="596"/>
         <source>%1: %2 cards imported</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="841"/>
+        <location filename="src/pages.cpp" line="605"/>
         <source>Save card database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="842"/>
+        <location filename="src/pages.cpp" line="606"/>
         <source>XML; card database (*.xml)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="874"/>
+        <location filename="src/pages.cpp" line="638"/>
         <source>The file could not be saved to %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -433,8 +416,7 @@
     </message>
     <message>
         <location filename="src/pagetemplates.cpp" line="115"/>
-        <source>Downloading (0 MB)</source>
-        <oldsource>Downloading (0MB)</oldsource>
+        <source>Downloading (0MB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -607,7 +589,7 @@
 <context>
     <name>i18n</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="24"/>
+        <location filename="src/oraclewizard.cpp" line="22"/>
         <source>English</source>
         <translation type="unfinished"></translation>
     </message>
@@ -615,12 +597,12 @@
 <context>
     <name>main</name>
     <message>
-        <location filename="src/main.cpp" line="48"/>
+        <location filename="src/main.cpp" line="62"/>
         <source>Only run in spoiler mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/main.cpp" line="49"/>
+        <location filename="src/main.cpp" line="63"/>
         <source>Run in no-confirm background mode</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/oracle/src/main.cpp b/oracle/src/main.cpp
index cae2ee37d..103c72784 100644
--- a/oracle/src/main.cpp
+++ b/oracle/src/main.cpp
@@ -5,12 +5,8 @@
 
 #include <../../cockatrice/src/client/settings/cache_settings.h>
 #include <QApplication>
-#include <QCommandLineOption>
 #include <QCommandLineParser>
-#include <QCoreApplication>
-#include <QGuiApplication>
 #include <QIcon>
-#include <QString>
 #include <QTimer>
 #include <QTranslator>
 #include <libcockatrice/settings/personal_settings.h>
diff --git a/oracle/src/oracleimporter.cpp b/oracle/src/oracleimporter.cpp
index 3382e36d6..88b522197 100644
--- a/oracle/src/oracleimporter.cpp
+++ b/oracle/src/oracleimporter.cpp
@@ -1,35 +1,20 @@
 #include "oracleimporter.h"
 
-#include "libcockatrice/card/card_info.h"
-#include "libcockatrice/card/format/format_legality_rules.h"
-#include "libcockatrice/card/lazy_properties_hash.h"
-#include "libcockatrice/card/relation/card_relation_type.h"
+#include "libcockatrice/interfaces/noop_card_preference_provider.h"
 #include "libcockatrice/interfaces/noop_card_set_priority_controller.h"
 #include "parsehelpers.h"
 
-#include <QChar>
 #include <QDebug>
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QJsonParseError>
-#include <QJsonValue>
-#include <QJsonValueConstRef>
-#include <QJsonValueRef>
-#include <QPair>
 #include <QRegularExpression>
-#include <QRegularExpressionMatch>
 #include <QSet>
-#include <QSharedPointer>
-#include <QVariant>
-#include <QtGlobal>
 #include <algorithm>
 #include <climits>
 #include <libcockatrice/card/card_localization.h>
 #include <libcockatrice/card/database/parser/cockatrice_xml_4.h>
 #include <libcockatrice/card/relation/card_relation.h>
-#include <qlogging.h>
-
-class ICardSetPriorityController;
 
 static const QList<AllowedCount> kConstructedCounts = {{4, "legal"}, {0, "banned"}};
 
@@ -301,9 +286,9 @@ CardInfoPtr OracleImporter::addCard(QString name,
 
 static QString getJsonString(const QJsonObject &obj, const QString &key)
 {
-    // QVariant coerces numbers to text, while QJsonValue::toString() returns a
-    // null string for them — MTGJSON fields like manaValue and convertedManaCost
-    // carry those types.
+    // QVariant coerces numbers and booleans to text, while QJsonValue::toString()
+    // returns a null string for them — some MTGJSON fields (manaValue,
+    // convertedManaCost, isOnlineOnly, isRebalanced) carry those types.
     return obj.value(key).toVariant().toString();
 }
 
@@ -412,8 +397,11 @@ int OracleImporter::importCardsFromSet(const CardSetPtr &currentSet, const QJson
     };
 
     // mtgjson name => xml name
-    static const QMap<QString, QString> setInfoProperties{
-        {"number", "num"}, {"rarity", "rarity"}, {"artist", "artist"}};
+    static const QMap<QString, QString> setInfoProperties{{"number", "num"},
+                                                          {"rarity", "rarity"},
+                                                          {"isOnlineOnly", "isOnlineOnly"},
+                                                          {"isRebalanced", "isRebalanced"},
+                                                          {"artist", "artist"}};
 
     // mtgjson name => xml name
     static const QMap<QString, QString> identifierProperties{{"multiverseId", "muid"}, {"scryfallId", "uuid"}};
@@ -848,7 +836,7 @@ int OracleImporter::startImport()
 
 bool OracleImporter::saveToFile(const QString &fileName, const QString &sourceUrl, const QString &sourceVersion)
 {
-    CockatriceXml4Parser parser(new NoopCardSetPriorityController());
+    CockatriceXml4Parser parser(new NoopCardPreferenceProvider(), new NoopCardSetPriorityController());
 
     return parser.saveToFile(createDefaultMagicFormats(), sets, cards, fileName, sourceUrl, sourceVersion);
 }
diff --git a/oracle/src/oracleimporter.h b/oracle/src/oracleimporter.h
index d872e184e..c8d3a19bf 100644
--- a/oracle/src/oracleimporter.h
+++ b/oracle/src/oracleimporter.h
@@ -1,29 +1,18 @@
 #ifndef ORACLEIMPORTER_H
 #define ORACLEIMPORTER_H
 
-#include "libcockatrice/card/printing/printing_info.h"
-#include "libcockatrice/card/set/card_set.h"
 #include "raw_json_scanner.h"
 
 #include <QAtomicInt>
 #include <QByteArray>
-#include <QDate>
-#include <QHash>
 #include <QJsonArray>
 #include <QJsonObject>
-#include <QList>
 #include <QMap>
-#include <QObject>
-#include <QString>
-#include <QStringList>
+#include <QRegularExpression>
+#include <QVariant>
 #include <libcockatrice/card/card_info.h>
-#include <qnamespace.h>
-#include <qtmetamacros.h>
 #include <utility>
 
-class CardRelation;
-class QRegularExpression;
-
 // many users prefer not to see these sets with non english arts
 // they will given priority PriorityLowest
 const QStringList nonEnglishSets = {"4BB", "FBB", "PS11", "PSAL", "REN", "RIN"};
@@ -185,10 +174,9 @@ private:
 
     /**
      * Whether readSetsFromByteArray() should report scan progress via
-     * dataReadProgress. The wizard streams that signal to stdout (for the
-     * hosting Cockatrice client to parse) in both interactive and background
-     * runs; the flag exists to skip the scanner instrumentation entirely when
-     * no consumer needs it.
+     * dataReadProgress. A background run routes that signal to stdout (for the
+     * hosting Cockatrice client to parse); the flag exists to skip the scanner
+     * instrumentation entirely when no consumer needs it.
      */
     bool progressReporting = true;
 
@@ -256,9 +244,9 @@ public:
      * @brief Controls whether readSetsFromByteArray() instruments the raw scan.
      *
      * When enabled (the default) the raw scanner reports progress via
-     * dataReadProgress(), which the wizard streams to stdout (so the hosting
-     * Cockatrice client can show it) and also displays on its own progress bar.
-     * Switch it off only when nothing will consume scan progress.
+     * dataReadProgress(), which an interactive wizard shows on its progress bar
+     * and a background run routes to stdout for the hosting client. Switch it
+     * off only when nothing will consume scan progress.
      */
     void setProgressReporting(bool enabled)
     {
diff --git a/oracle/src/oraclewizard.cpp b/oracle/src/oraclewizard.cpp
index 05f08ce64..9ce0d7b51 100644
--- a/oracle/src/oraclewizard.cpp
+++ b/oracle/src/oraclewizard.cpp
@@ -6,28 +6,17 @@
 #include "pages.h"
 #include "pagetemplates.h"
 
-#include <QAbstractButton>
-#include <QApplication>
-#include <QDebug>
-#include <QDialog>
-#include <QEvent>
-#include <QFile>
-#include <QIODevice>
-#include <QList>
-#include <QLocalServer>
-#include <QLocalSocket>
-#include <QNetworkAccessManager>
-#include <QSettings>
-#include <QVariant>
-#include <QWindow>
-#include <QWizardPage>
-#include <QtGlobal>
+#include <QCheckBox>
+#include <QFileDialog>
+#include <QGridLayout>
+#include <QLineEdit>
+#include <QNetworkReply>
+#include <QPushButton>
+#include <QScrollBar>
+#include <QtConcurrent>
+#include <QtGui>
 #include <libcockatrice/settings/cards_display_settings.h>
 #include <libcockatrice/settings/personal_settings.h>
-#include <libcockatrice/utility/local_server_name.h>
-#include <qlogging.h>
-
-class QWidget;
 
 OracleWizard::OracleWizard(QWidget *parent) : QWizard(parent)
 {
@@ -75,7 +64,6 @@ OracleWizard::OracleWizard(QWidget *parent) : QWizard(parent)
     }
 
     retranslateUi();
-    startRaiseServer();
 }
 
 /**
@@ -144,54 +132,6 @@ void OracleWizard::runInBackground()
     currentPage()->initializePage();
 }
 
-void OracleWizard::startRaiseServer()
-{
-    // Scope the socket name to the current user, mirroring the hosting client.
-    raiseServer = new QLocalServer(this);
-    connect(raiseServer, &QLocalServer::newConnection, this, &OracleWizard::handleRaiseRequest);
-    const QString serverName = scopedLocalServerName(QStringLiteral("CockatriceOracleRaise"));
-    if (raiseServer->listen(serverName)) {
-        return;
-    }
-    // A stale socket left behind by a crashed run holds the name: take it back.
-    QLocalServer::removeServer(serverName);
-    if (!raiseServer->listen(serverName)) {
-        qWarning() << "Oracle: could not listen for raise requests on" << serverName;
-        delete raiseServer;
-        raiseServer = nullptr;
-    }
-}
-
-void OracleWizard::handleRaiseRequest()
-{
-    while (raiseServer && raiseServer->hasPendingConnections()) {
-        QLocalSocket *socket = raiseServer->nextPendingConnection();
-        connect(socket, &QLocalSocket::readyRead, this, [this, socket]() {
-            socket->readAll();
-            socket->deleteLater();
-            raiseWizard();
-        });
-        connect(socket, &QLocalSocket::disconnected, socket, &QLocalSocket::deleteLater);
-    }
-    raiseWizard();
-}
-
-void OracleWizard::raiseWizard()
-{
-    // An ongoing background run is hidden; the user asked to see it, so promote it to a window.
-    if (backgroundMode && !isVisible()) {
-        show();
-    }
-    if (isMinimized()) {
-        showNormal();
-    }
-    raise();
-    activateWindow();
-    if (windowHandle()) {
-        windowHandle()->requestActivate();
-    }
-}
-
 void OracleWizard::enableButtons()
 {
     button(QWizard::NextButton)->setDisabled(false);
diff --git a/oracle/src/oraclewizard.h b/oracle/src/oraclewizard.h
index ea652bdc5..9a509ce5e 100644
--- a/oracle/src/oraclewizard.h
+++ b/oracle/src/oraclewizard.h
@@ -1,17 +1,21 @@
 #ifndef ORACLEWIZARD_H
 #define ORACLEWIZARD_H
 
-#include <QByteArray>
-#include <QString>
 #include <QWizard>
-#include <qtmetamacros.h>
 #include <utility>
 
+class QCheckBox;
+class QGroupBox;
+class QComboBox;
+class QLabel;
+class QLineEdit;
+class QRadioButton;
+class QProgressBar;
 class QNetworkAccessManager;
+class QTextEdit;
+class QVBoxLayout;
 class OracleImporter;
-class QLocalServer;
 class QSettings;
-class QWidget;
 
 class OracleWizard : public QWizard
 {
@@ -61,7 +65,6 @@ public:
 
 private slots:
     void updateLanguage();
-    void handleRaiseRequest();
 
 private:
     QByteArray tokensData;
@@ -69,13 +72,6 @@ private:
     QString cardSourceVersion;
 
     void migrateOracleSettings();
-    /**
-     * @brief Starts the local socket the hosting Cockatrice client uses to bring this wizard forward.
-     */
-    void startRaiseServer();
-    /** @brief Shows, raises and activates the wizard window. */
-    void raiseWizard();
-    QLocalServer *raiseServer = nullptr; ///< listens for raise requests from the hosting client
 
 protected:
     void changeEvent(QEvent *event) override;
diff --git a/oracle/src/pages.cpp b/oracle/src/pages.cpp
index 8c286fb46..566c88520 100644
--- a/oracle/src/pages.cpp
+++ b/oracle/src/pages.cpp
@@ -4,59 +4,36 @@
 #include "main.h"
 #include "oracleimporter.h"
 #include "oraclewizard.h"
+#include "pages.h"
 #include "pagetemplates.h"
 #include "version_string.h"
 
+#include <QAbstractButton>
 #include <QBuffer>
 #include <QCheckBox>
 #include <QComboBox>
-#include <QCoreApplication>
 #include <QDebug>
 #include <QDir>
-#include <QFile>
 #include <QFileDialog>
-#include <QFileInfo>
 #include <QGridLayout>
-#include <QIODevice>
-#include <QJsonDocument>
-#include <QJsonParseError>
 #include <QLabel>
 #include <QLineEdit>
-#include <QList>
-#include <QMap>
 #include <QMessageBox>
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
-#include <QNetworkRequest>
-#include <QObject>
 #include <QPointer>
 #include <QProgressBar>
 #include <QPushButton>
 #include <QRadioButton>
 #include <QScrollBar>
-#include <QSettings>
-#include <QSharedPointer>
+#include <QStandardPaths>
 #include <QTextEdit>
 #include <QTextStream>
-#include <QTimer>
-#include <QTranslator>
-#include <QUrl>
-#include <QVariant>
-#include <QWizard>
-#include <QtConcurrentRun>
-#include <QtGlobal>
+#include <QtConcurrent>
+#include <QtGui>
 #include <cstdio>
-#include <functional>
 #include <libcockatrice/settings/personal_settings.h>
 #include <libcockatrice/utility/translation_loader.h>
-#include <qlogging.h>
-#include <qnamespace.h>
-#include <qnumeric.h>
-#include <stdlib.h>
-#include <tuple>
-#include <utility>
-
-class QWidget;
 
 #ifdef HAS_LZMA
 #include "lzma/decompress.h"
@@ -82,12 +59,13 @@ class QWidget;
 #endif
 
 /**
- * @brief Emits one machine-readable progress line to stdout.
+ * @brief Emits one machine-readable background-run progress line to stdout.
  *
- * The hosting Cockatrice client parses these lines to drive a determinate
- * progress bar. stderr stays reserved for human-readable log output.
+ * Used only in background mode, so the hosting Cockatrice client can parse these
+ * lines to drive a determinate progress bar. stderr stays reserved for
+ * human-readable log output.
  */
-static void emitProgress(const char *stage, qint64 done, qint64 total)
+static void emitBackgroundProgress(const char *stage, qint64 done, qint64 total)
 {
     QTextStream out(stdout);
     out << "PROGRESS " << stage << ' ' << done << ' ' << total << '\n';
@@ -472,7 +450,9 @@ void LoadSetsPage::downloadSetsFile(const QUrl &url)
 
 void LoadSetsPage::actDownloadProgressSetsFile(qint64 received, qint64 total)
 {
-    emitProgress("download", received, total);
+    if (wizard()->backgroundMode) {
+        emitBackgroundProgress("download", received, total);
+    }
     if (total > 0) {
         progressBar->setMaximum(static_cast<int>(total));
         progressBar->setValue(static_cast<int>(received));
@@ -531,7 +511,7 @@ void LoadSetsPage::updateParsingProgress(int bytesRead, int totalBytes)
 
 void LoadSetsPage::scanProgressToStdout(int bytesRead, int totalBytes)
 {
-    emitProgress("scan", bytesRead, totalBytes);
+    emitBackgroundProgress("scan", bytesRead, totalBytes);
 }
 
 void LoadSetsPage::beginLoadSets(bool compressedFile)
@@ -838,18 +818,18 @@ void SaveSetsPage::updateTotalProgress(int cardsImported, int setIndex, const QS
         const int cardCount = wizard()->importer->getCardList().size();
         if (wizard()->backgroundMode) {
             qInfo() << tr("Import finished: %1 cards.").arg(cardCount);
+            emitBackgroundProgress("import", totalSets, totalSets);
         } else {
             messageLog->append("<b>" + tr("Import finished: %1 cards.").arg(cardCount) + "</b>");
         }
-        emitProgress("import", totalSets, totalSets);
     } else {
         progressBar->setValue(setIndex);
         if (wizard()->backgroundMode) {
             qInfo() << tr("%1: %2 cards imported").arg(setName).arg(cardsImported);
+            emitBackgroundProgress("import", setIndex, totalSets);
         } else {
             messageLog->append(tr("%1: %2 cards imported").arg(setName).arg(cardsImported));
         }
-        emitProgress("import", setIndex, totalSets);
     }
 
     messageLog->verticalScrollBar()->setValue(messageLog->verticalScrollBar()->maximum());
diff --git a/oracle/src/pages.h b/oracle/src/pages.h
index 221f032d3..d0a9fcd43 100644
--- a/oracle/src/pages.h
+++ b/oracle/src/pages.h
@@ -7,20 +7,22 @@
 #include <QFuture>
 #include <QFutureWatcher>
 #include <QString>
-#include <QStringList>
-#include <QtGlobal>
-#include <qtmetamacros.h>
+#include <QTimer>
+#include <QWizard>
+#include <utility>
 
 class QCheckBox;
+class QGroupBox;
 class QComboBox;
 class QLabel;
 class QLineEdit;
 class QRadioButton;
 class QProgressBar;
+class QNetworkAccessManager;
 class QTextEdit;
-class QPushButton;
-class QUrl;
-class QWidget;
+class QVBoxLayout;
+class OracleImporter;
+class QSettings;
 
 class IntroPage : public OracleWizardPage
 {
diff --git a/oracle/src/pagetemplates.cpp b/oracle/src/pagetemplates.cpp
index d37818dcb..0ffeabbb3 100644
--- a/oracle/src/pagetemplates.cpp
+++ b/oracle/src/pagetemplates.cpp
@@ -3,32 +3,17 @@
 #include "oraclewizard.h"
 
 #include <QCheckBox>
-#include <QDebug>
 #include <QDir>
-#include <QFile>
 #include <QFileDialog>
-#include <QFileInfo>
 #include <QGridLayout>
-#include <QIODevice>
 #include <QLabel>
 #include <QLineEdit>
-#include <QList>
 #include <QMessageBox>
-#include <QNetworkAccessManager>
 #include <QNetworkReply>
-#include <QNetworkRequest>
-#include <QObject>
 #include <QProgressBar>
 #include <QPushButton>
 #include <QRadioButton>
-#include <QSettings>
-#include <QSharedPointer>
-#include <QUrl>
-#include <QVariant>
-#include <qlogging.h>
-#include <qnamespace.h>
-
-class QWidget;
+#include <QtGui>
 
 SimpleDownloadFilePage::SimpleDownloadFilePage(QWidget *parent) : OracleWizardPage(parent)
 {
diff --git a/oracle/src/pagetemplates.h b/oracle/src/pagetemplates.h
index 2a996801d..ccad7ec62 100644
--- a/oracle/src/pagetemplates.h
+++ b/oracle/src/pagetemplates.h
@@ -1,21 +1,15 @@
 #ifndef PAGETEMPLATES_H
 #define PAGETEMPLATES_H
 
-#include <QByteArray>
-#include <QString>
 #include <QWizardPage>
-#include <QtGlobal>
-#include <qtmetamacros.h>
 
+class QFile;
 class QRadioButton;
 class OracleWizard;
 class QCheckBox;
 class QLabel;
 class QLineEdit;
 class QProgressBar;
-class QPushButton;
-class QUrl;
-class QWidget;
 
 class OracleWizardPage : public QWizardPage
 {
diff --git a/oracle/src/parsehelpers.cpp b/oracle/src/parsehelpers.cpp
index 2c897031f..ee7c4eb2e 100644
--- a/oracle/src/parsehelpers.cpp
+++ b/oracle/src/parsehelpers.cpp
@@ -1,11 +1,7 @@
 #include "parsehelpers.h"
 
 #include <QChar>
-#include <QList>
 #include <QRegularExpression>
-#include <QRegularExpressionMatch>
-#include <QSharedPointer>
-#include <QStringList>
 
 /**
  * Parses the card text to determine if the card should have the cipt tag
diff --git a/oracle/src/raw_json_scanner.cpp b/oracle/src/raw_json_scanner.cpp
index 2396b59ae..8c4633598 100644
--- a/oracle/src/raw_json_scanner.cpp
+++ b/oracle/src/raw_json_scanner.cpp
@@ -1,9 +1,5 @@
 #include "raw_json_scanner.h"
 
-#include <QByteArray>
-#include <QChar>
-#include <QSharedPointer>
-#include <QStringLiteral>
 #include <algorithm>
 #include <cstring>
 
diff --git a/oracle/src/raw_json_scanner.h b/oracle/src/raw_json_scanner.h
index 18030d834..04fcc52e4 100644
--- a/oracle/src/raw_json_scanner.h
+++ b/oracle/src/raw_json_scanner.h
@@ -1,13 +1,11 @@
 #ifndef RAW_JSON_SCANNER_H
 #define RAW_JSON_SCANNER_H
 
+#include <QByteArray>
 #include <QList>
 #include <QString>
-#include <QtGlobal>
 #include <functional>
 
-class QByteArray;
-
 namespace RawJson
 {
 
diff --git a/qt6.imp b/qt6.imp
deleted file mode 100644
index 4f09d6406..000000000
--- a/qt6.imp
+++ /dev/null
@@ -1,2471 +0,0 @@
-# Do not edit! Generated by generate_qt_mappings.py from
-# /usr/include/qt6
-[
-  { "symbol": [ "QAbstractAnimation", "private", "<QAbstractAnimation>", "public"] },
-  { "symbol": [ "QAbstractButton", "private", "<QAbstractButton>", "public"] },
-  { "symbol": [ "QAbstractEventDispatcher", "private", "<QAbstractEventDispatcher>", "public"] },
-  { "symbol": [ "QAbstractEventDispatcherV2", "private", "<QAbstractEventDispatcherV2>", "public"] },
-  { "symbol": [ "QAbstractFileIconProvider", "private", "<QAbstractFileIconProvider>", "public"] },
-  { "symbol": [ "QAbstractGraphicsShapeItem", "private", "<QAbstractGraphicsShapeItem>", "public"] },
-  { "symbol": [ "QAbstractItemDelegate", "private", "<QAbstractItemDelegate>", "public"] },
-  { "symbol": [ "QAbstractItemModel", "private", "<QAbstractItemModel>", "public"] },
-  { "symbol": [ "QAbstractItemModelTester", "private", "<QAbstractItemModelTester>", "public"] },
-  { "symbol": [ "QAbstractItemView", "private", "<QAbstractItemView>", "public"] },
-  { "symbol": [ "QAbstractListModel", "private", "<QAbstractListModel>", "public"] },
-  { "symbol": [ "QAbstractNativeEventFilter", "private", "<QAbstractNativeEventFilter>", "public"] },
-  { "symbol": [ "QAbstractNetworkCache", "private", "<QAbstractNetworkCache>", "public"] },
-  { "symbol": [ "QAbstractOAuth", "private", "<QAbstractOAuth>", "public"] },
-  { "symbol": [ "QAbstractOAuth2", "private", "<QAbstractOAuth2>", "public"] },
-  { "symbol": [ "QAbstractOAuthReplyHandler", "private", "<QAbstractOAuthReplyHandler>", "public"] },
-  { "symbol": [ "QAbstractPrintDialog", "private", "<QAbstractPrintDialog>", "public"] },
-  { "symbol": [ "QAbstractProxyModel", "private", "<QAbstractProxyModel>", "public"] },
-  { "symbol": [ "QAbstractScrollArea", "private", "<QAbstractScrollArea>", "public"] },
-  { "symbol": [ "QAbstractSlider", "private", "<QAbstractSlider>", "public"] },
-  { "symbol": [ "QAbstractSocket", "private", "<QAbstractSocket>", "public"] },
-  { "symbol": [ "QAbstractSpinBox", "private", "<QAbstractSpinBox>", "public"] },
-  { "symbol": [ "QAbstractState", "private", "<QAbstractState>", "public"] },
-  { "symbol": [ "QAbstractTableModel", "private", "<QAbstractTableModel>", "public"] },
-  { "symbol": [ "QAbstractTextDocumentLayout", "private", "<QAbstractTextDocumentLayout>", "public"] },
-  { "symbol": [ "QAbstractTransition", "private", "<QAbstractTransition>", "public"] },
-  { "symbol": [ "QAbstractUndoItem", "private", "<QAbstractUndoItem>", "public"] },
-  { "symbol": [ "QAbstractVideoBuffer", "private", "<QAbstractVideoBuffer>", "public"] },
-  { "symbol": [ "QAccessibilityHints", "private", "<QAccessibilityHints>", "public"] },
-  { "symbol": [ "QAccessible", "private", "<QAccessible>", "public"] },
-  { "symbol": [ "QAccessibleActionInterface", "private", "<QAccessibleActionInterface>", "public"] },
-  { "symbol": [ "QAccessibleAnnouncementEvent", "private", "<QAccessibleAnnouncementEvent>", "public"] },
-  { "symbol": [ "QAccessibleApplication", "private", "<QAccessibleApplication>", "public"] },
-  { "symbol": [ "QAccessibleAttributesInterface", "private", "<QAccessibleAttributesInterface>", "public"] },
-  { "symbol": [ "QAccessibleBridge", "private", "<QAccessibleBridge>", "public"] },
-  { "symbol": [ "QAccessibleBridgePlugin", "private", "<QAccessibleBridgePlugin>", "public"] },
-  { "symbol": [ "QAccessibleEditableTextInterface", "private", "<QAccessibleEditableTextInterface>", "public"] },
-  { "symbol": [ "QAccessibleEvent", "private", "<QAccessibleEvent>", "public"] },
-  { "symbol": [ "QAccessibleHyperlinkInterface", "private", "<QAccessibleHyperlinkInterface>", "public"] },
-  { "symbol": [ "QAccessibleImageInterface", "private", "<QAccessibleImageInterface>", "public"] },
-  { "symbol": [ "QAccessibleInterface", "private", "<QAccessibleInterface>", "public"] },
-  { "symbol": [ "QAccessibleObject", "private", "<QAccessibleObject>", "public"] },
-  { "symbol": [ "QAccessiblePlugin", "private", "<QAccessiblePlugin>", "public"] },
-  { "symbol": [ "QAccessibleSelectionInterface", "private", "<QAccessibleSelectionInterface>", "public"] },
-  { "symbol": [ "QAccessibleStateChangeEvent", "private", "<QAccessibleStateChangeEvent>", "public"] },
-  { "symbol": [ "QAccessibleTableCellInterface", "private", "<QAccessibleTableCellInterface>", "public"] },
-  { "symbol": [ "QAccessibleTableInterface", "private", "<QAccessibleTableInterface>", "public"] },
-  { "symbol": [ "QAccessibleTableModelChangeEvent", "private", "<QAccessibleTableModelChangeEvent>", "public"] },
-  { "symbol": [ "QAccessibleTextCursorEvent", "private", "<QAccessibleTextCursorEvent>", "public"] },
-  { "symbol": [ "QAccessibleTextInsertEvent", "private", "<QAccessibleTextInsertEvent>", "public"] },
-  { "symbol": [ "QAccessibleTextInterface", "private", "<QAccessibleTextInterface>", "public"] },
-  { "symbol": [ "QAccessibleTextRemoveEvent", "private", "<QAccessibleTextRemoveEvent>", "public"] },
-  { "symbol": [ "QAccessibleTextSelectionEvent", "private", "<QAccessibleTextSelectionEvent>", "public"] },
-  { "symbol": [ "QAccessibleTextUpdateEvent", "private", "<QAccessibleTextUpdateEvent>", "public"] },
-  { "symbol": [ "QAccessibleValueChangeEvent", "private", "<QAccessibleValueChangeEvent>", "public"] },
-  { "symbol": [ "QAccessibleValueInterface", "private", "<QAccessibleValueInterface>", "public"] },
-  { "symbol": [ "QAccessibleWidget", "private", "<QAccessibleWidget>", "public"] },
-  { "symbol": [ "QAccessibleWidgetV2", "private", "<QAccessibleWidgetV2>", "public"] },
-  { "symbol": [ "QAction", "private", "<QAction>", "public"] },
-  { "symbol": [ "QActionEvent", "private", "<QActionEvent>", "public"] },
-  { "symbol": [ "QActionGroup", "private", "<QActionGroup>", "public"] },
-  { "symbol": [ "QAmbientSound", "private", "<QAmbientSound>", "public"] },
-  { "symbol": [ "QAnimationDriver", "private", "<QAnimationDriver>", "public"] },
-  { "symbol": [ "QAnimationGroup", "private", "<QAnimationGroup>", "public"] },
-  { "symbol": [ "QAnyStringView", "private", "<QAnyStringView>", "public"] },
-  { "symbol": [ "QApplication", "private", "<QApplication>", "public"] },
-  { "symbol": [ "QApplicationStateChangeEvent", "private", "<QApplicationStateChangeEvent>", "public"] },
-  { "symbol": [ "QApplicationStatic", "private", "<QApplicationStatic>", "public"] },
-  { "symbol": [ "QArgument", "private", "<QArgument>", "public"] },
-  { "symbol": [ "QArrayData", "private", "<QArrayData>", "public"] },
-  { "symbol": [ "QArrayDataOps", "private", "<QArrayDataOps>", "public"] },
-  { "symbol": [ "QArrayDataPointer", "private", "<QArrayDataPointer>", "public"] },
-  { "symbol": [ "QAssociativeConstIterator", "private", "<QAssociativeConstIterator>", "public"] },
-  { "symbol": [ "QAssociativeIterable", "private", "<QAssociativeIterable>", "public"] },
-  { "symbol": [ "QAssociativeIterator", "private", "<QAssociativeIterator>", "public"] },
-  { "symbol": [ "QAtomicInt", "private", "<QAtomicInt>", "public"] },
-  { "symbol": [ "QAtomicInteger", "private", "<QAtomicInteger>", "public"] },
-  { "symbol": [ "QAtomicPointer", "private", "<QAtomicPointer>", "public"] },
-  { "symbol": [ "QAtomicScopedValueRollback", "private", "<QAtomicScopedValueRollback>", "public"] },
-  { "symbol": [ "QAudio", "private", "<QAudio>", "public"] },
-  { "symbol": [ "QAudioBuffer", "private", "<QAudioBuffer>", "public"] },
-  { "symbol": [ "QAudioBufferInput", "private", "<QAudioBufferInput>", "public"] },
-  { "symbol": [ "QAudioBufferOutput", "private", "<QAudioBufferOutput>", "public"] },
-  { "symbol": [ "QAudioDecoder", "private", "<QAudioDecoder>", "public"] },
-  { "symbol": [ "QAudioDevice", "private", "<QAudioDevice>", "public"] },
-  { "symbol": [ "QAudioEngine", "private", "<QAudioEngine>", "public"] },
-  { "symbol": [ "QAudioFormat", "private", "<QAudioFormat>", "public"] },
-  { "symbol": [ "QAudioFrame", "private", "<QAudioFrame>", "public"] },
-  { "symbol": [ "QAudioInput", "private", "<QAudioInput>", "public"] },
-  { "symbol": [ "QAudioListener", "private", "<QAudioListener>", "public"] },
-  { "symbol": [ "QAudioOutput", "private", "<QAudioOutput>", "public"] },
-  { "symbol": [ "QAudioRoom", "private", "<QAudioRoom>", "public"] },
-  { "symbol": [ "QAudioSink", "private", "<QAudioSink>", "public"] },
-  { "symbol": [ "QAudioSource", "private", "<QAudioSource>", "public"] },
-  { "symbol": [ "QAuthenticator", "private", "<QAuthenticator>", "public"] },
-  { "symbol": [ "QBEInteger", "private", "<QBEInteger>", "public"] },
-  { "symbol": [ "QBackingStore", "private", "<QBackingStore>", "public"] },
-  { "symbol": [ "QBaseIterator", "private", "<QBaseIterator>", "public"] },
-  { "symbol": [ "QBasicMutex", "private", "<QBasicMutex>", "public"] },
-  { "symbol": [ "QBasicReadWriteLock", "private", "<QBasicReadWriteLock>", "public"] },
-  { "symbol": [ "QBasicTimer", "private", "<QBasicTimer>", "public"] },
-  { "symbol": [ "QBasicUtf8StringView", "private", "<QBasicUtf8StringView>", "public"] },
-  { "symbol": [ "QBigEndianStorageType", "private", "<QBigEndianStorageType>", "public"] },
-  { "symbol": [ "QBinaryJson", "private", "<QBinaryJson>", "public"] },
-  { "symbol": [ "QBindable", "private", "<QBindable>", "public"] },
-  { "symbol": [ "QBindingStatus", "private", "<QBindingStatus>", "public"] },
-  { "symbol": [ "QBindingStorage", "private", "<QBindingStorage>", "public"] },
-  { "symbol": [ "QBitArray", "private", "<QBitArray>", "public"] },
-  { "symbol": [ "QBitRef", "private", "<QBitRef>", "public"] },
-  { "symbol": [ "QBitmap", "private", "<QBitmap>", "public"] },
-  { "symbol": [ "QBluetoothAddress", "private", "<QBluetoothAddress>", "public"] },
-  { "symbol": [ "QBluetoothDeviceDiscoveryAgent", "private", "<QBluetoothDeviceDiscoveryAgent>", "public"] },
-  { "symbol": [ "QBluetoothDeviceInfo", "private", "<QBluetoothDeviceInfo>", "public"] },
-  { "symbol": [ "QBluetoothHostInfo", "private", "<QBluetoothHostInfo>", "public"] },
-  { "symbol": [ "QBluetoothLocalDevice", "private", "<QBluetoothLocalDevice>", "public"] },
-  { "symbol": [ "QBluetoothPermission", "private", "<QBluetoothPermission>", "public"] },
-  { "symbol": [ "QBluetoothServer", "private", "<QBluetoothServer>", "public"] },
-  { "symbol": [ "QBluetoothServiceDiscoveryAgent", "private", "<QBluetoothServiceDiscoveryAgent>", "public"] },
-  { "symbol": [ "QBluetoothServiceInfo", "private", "<QBluetoothServiceInfo>", "public"] },
-  { "symbol": [ "QBluetoothSocket", "private", "<QBluetoothSocket>", "public"] },
-  { "symbol": [ "QBluetoothUuid", "private", "<QBluetoothUuid>", "public"] },
-  { "symbol": [ "QBoxLayout", "private", "<QBoxLayout>", "public"] },
-  { "symbol": [ "QBrush", "private", "<QBrush>", "public"] },
-  { "symbol": [ "QBrushData", "private", "<QBrushData>", "public"] },
-  { "symbol": [ "QBrushDataPointerDeleter", "private", "<QBrushDataPointerDeleter>", "public"] },
-  { "symbol": [ "QBuffer", "private", "<QBuffer>", "public"] },
-  { "symbol": [ "QButtonGroup", "private", "<QButtonGroup>", "public"] },
-  { "symbol": [ "QByteArray", "private", "<QByteArray>", "public"] },
-  { "symbol": [ "QByteArrayAlgorithms", "private", "<QByteArrayAlgorithms>", "public"] },
-  { "symbol": [ "QByteArrayList", "private", "<QByteArrayList>", "public"] },
-  { "symbol": [ "QByteArrayListIterator", "private", "<QByteArrayListIterator>", "public"] },
-  { "symbol": [ "QByteArrayMatcher", "private", "<QByteArrayMatcher>", "public"] },
-  { "symbol": [ "QByteArrayView", "private", "<QByteArrayView>", "public"] },
-  { "symbol": [ "QCache", "private", "<QCache>", "public"] },
-  { "symbol": [ "QCalendar", "private", "<QCalendar>", "public"] },
-  { "symbol": [ "QCalendarPermission", "private", "<QCalendarPermission>", "public"] },
-  { "symbol": [ "QCalendarWidget", "private", "<QCalendarWidget>", "public"] },
-  { "symbol": [ "QCamera", "private", "<QCamera>", "public"] },
-  { "symbol": [ "QCameraDevice", "private", "<QCameraDevice>", "public"] },
-  { "symbol": [ "QCameraFormat", "private", "<QCameraFormat>", "public"] },
-  { "symbol": [ "QCapturableWindow", "private", "<QCapturableWindow>", "public"] },
-  { "symbol": [ "QCborArray", "private", "<QCborArray>", "public"] },
-  { "symbol": [ "QCborError", "private", "<QCborError>", "public"] },
-  { "symbol": [ "QCborMap", "private", "<QCborMap>", "public"] },
-  { "symbol": [ "QCborParserError", "private", "<QCborParserError>", "public"] },
-  { "symbol": [ "QCborStreamReader", "private", "<QCborStreamReader>", "public"] },
-  { "symbol": [ "QCborStreamWriter", "private", "<QCborStreamWriter>", "public"] },
-  { "symbol": [ "QCborValue", "private", "<QCborValue>", "public"] },
-  { "symbol": [ "QCborValueConstRef", "private", "<QCborValueConstRef>", "public"] },
-  { "symbol": [ "QCborValueRef", "private", "<QCborValueRef>", "public"] },
-  { "symbol": [ "QChar", "private", "<QChar>", "public"] },
-  { "symbol": [ "QCheckBox", "private", "<QCheckBox>", "public"] },
-  { "symbol": [ "QChildEvent", "private", "<QChildEvent>", "public"] },
-  { "symbol": [ "QChildWindowEvent", "private", "<QChildWindowEvent>", "public"] },
-  { "symbol": [ "QChronoTimer", "private", "<QChronoTimer>", "public"] },
-  { "symbol": [ "QClipboard", "private", "<QClipboard>", "public"] },
-  { "symbol": [ "QCloseEvent", "private", "<QCloseEvent>", "public"] },
-  { "symbol": [ "QCollator", "private", "<QCollator>", "public"] },
-  { "symbol": [ "QCollatorSortKey", "private", "<QCollatorSortKey>", "public"] },
-  { "symbol": [ "QColor", "private", "<QColor>", "public"] },
-  { "symbol": [ "QColorDialog", "private", "<QColorDialog>", "public"] },
-  { "symbol": [ "QColorSpace", "private", "<QColorSpace>", "public"] },
-  { "symbol": [ "QColorTransform", "private", "<QColorTransform>", "public"] },
-  { "symbol": [ "QColormap", "private", "<QColormap>", "public"] },
-  { "symbol": [ "QColumnView", "private", "<QColumnView>", "public"] },
-  { "symbol": [ "QComboBox", "private", "<QComboBox>", "public"] },
-  { "symbol": [ "QCommandLineOption", "private", "<QCommandLineOption>", "public"] },
-  { "symbol": [ "QCommandLineParser", "private", "<QCommandLineParser>", "public"] },
-  { "symbol": [ "QCommandLinkButton", "private", "<QCommandLinkButton>", "public"] },
-  { "symbol": [ "QCommonStyle", "private", "<QCommonStyle>", "public"] },
-  { "symbol": [ "QCompleter", "private", "<QCompleter>", "public"] },
-  { "symbol": [ "QCompressedHelpInfo", "private", "<QCompressedHelpInfo>", "public"] },
-  { "symbol": [ "QConcatenateTablesProxyModel", "private", "<QConcatenateTablesProxyModel>", "public"] },
-  { "symbol": [ "QConicalGradient", "private", "<QConicalGradient>", "public"] },
-  { "symbol": [ "QConstIterator", "private", "<QConstIterator>", "public"] },
-  { "symbol": [ "QContactsPermission", "private", "<QContactsPermission>", "public"] },
-  { "symbol": [ "QContextMenuEvent", "private", "<QContextMenuEvent>", "public"] },
-  { "symbol": [ "QContiguousCache", "private", "<QContiguousCache>", "public"] },
-  { "symbol": [ "QContiguousCacheData", "private", "<QContiguousCacheData>", "public"] },
-  { "symbol": [ "QContiguousCacheTypedData", "private", "<QContiguousCacheTypedData>", "public"] },
-  { "symbol": [ "QCoreApplication", "private", "<QCoreApplication>", "public"] },
-  { "symbol": [ "QCryptographicHash", "private", "<QCryptographicHash>", "public"] },
-  { "symbol": [ "QCursor", "private", "<QCursor>", "public"] },
-  { "symbol": [ "QDBusAbstractAdaptor", "private", "<QDBusAbstractAdaptor>", "public"] },
-  { "symbol": [ "QDBusAbstractInterface", "private", "<QDBusAbstractInterface>", "public"] },
-  { "symbol": [ "QDBusAbstractInterfaceBase", "private", "<QDBusAbstractInterfaceBase>", "public"] },
-  { "symbol": [ "QDBusArgument", "private", "<QDBusArgument>", "public"] },
-  { "symbol": [ "QDBusConnection", "private", "<QDBusConnection>", "public"] },
-  { "symbol": [ "QDBusConnectionInterface", "private", "<QDBusConnectionInterface>", "public"] },
-  { "symbol": [ "QDBusContext", "private", "<QDBusContext>", "public"] },
-  { "symbol": [ "QDBusError", "private", "<QDBusError>", "public"] },
-  { "symbol": [ "QDBusInterface", "private", "<QDBusInterface>", "public"] },
-  { "symbol": [ "QDBusMessage", "private", "<QDBusMessage>", "public"] },
-  { "symbol": [ "QDBusMetaType", "private", "<QDBusMetaType>", "public"] },
-  { "symbol": [ "QDBusObjectPath", "private", "<QDBusObjectPath>", "public"] },
-  { "symbol": [ "QDBusPendingCall", "private", "<QDBusPendingCall>", "public"] },
-  { "symbol": [ "QDBusPendingCallWatcher", "private", "<QDBusPendingCallWatcher>", "public"] },
-  { "symbol": [ "QDBusPendingReply", "private", "<QDBusPendingReply>", "public"] },
-  { "symbol": [ "QDBusPendingReplyBase", "private", "<QDBusPendingReplyBase>", "public"] },
-  { "symbol": [ "QDBusReply", "private", "<QDBusReply>", "public"] },
-  { "symbol": [ "QDBusServer", "private", "<QDBusServer>", "public"] },
-  { "symbol": [ "QDBusServiceWatcher", "private", "<QDBusServiceWatcher>", "public"] },
-  { "symbol": [ "QDBusSignature", "private", "<QDBusSignature>", "public"] },
-  { "symbol": [ "QDBusUnixFileDescriptor", "private", "<QDBusUnixFileDescriptor>", "public"] },
-  { "symbol": [ "QDBusVariant", "private", "<QDBusVariant>", "public"] },
-  { "symbol": [ "QDBusVirtualObject", "private", "<QDBusVirtualObject>", "public"] },
-  { "symbol": [ "QDataStream", "private", "<QDataStream>", "public"] },
-  { "symbol": [ "QDataWidgetMapper", "private", "<QDataWidgetMapper>", "public"] },
-  { "symbol": [ "QDate", "private", "<QDate>", "public"] },
-  { "symbol": [ "QDateEdit", "private", "<QDateEdit>", "public"] },
-  { "symbol": [ "QDateTime", "private", "<QDateTime>", "public"] },
-  { "symbol": [ "QDateTimeEdit", "private", "<QDateTimeEdit>", "public"] },
-  { "symbol": [ "QDeadlineTimer", "private", "<QDeadlineTimer>", "public"] },
-  { "symbol": [ "QDebug", "private", "<QDebug>", "public"] },
-  { "symbol": [ "QDebugStateSaver", "private", "<QDebugStateSaver>", "public"] },
-  { "symbol": [ "QDesignerExportWidget", "private", "<QDesignerExportWidget>", "public"] },
-  { "symbol": [ "QDesktopServices", "private", "<QDesktopServices>", "public"] },
-  { "symbol": [ "QDial", "private", "<QDial>", "public"] },
-  { "symbol": [ "QDialog", "private", "<QDialog>", "public"] },
-  { "symbol": [ "QDialogButtonBox", "private", "<QDialogButtonBox>", "public"] },
-  { "symbol": [ "QDir", "private", "<QDir>", "public"] },
-  { "symbol": [ "QDirIterator", "private", "<QDirIterator>", "public"] },
-  { "symbol": [ "QDirListing", "private", "<QDirListing>", "public"] },
-  { "symbol": [ "QDnsDomainNameRecord", "private", "<QDnsDomainNameRecord>", "public"] },
-  { "symbol": [ "QDnsHostAddressRecord", "private", "<QDnsHostAddressRecord>", "public"] },
-  { "symbol": [ "QDnsLookup", "private", "<QDnsLookup>", "public"] },
-  { "symbol": [ "QDnsMailExchangeRecord", "private", "<QDnsMailExchangeRecord>", "public"] },
-  { "symbol": [ "QDnsServiceRecord", "private", "<QDnsServiceRecord>", "public"] },
-  { "symbol": [ "QDnsTextRecord", "private", "<QDnsTextRecord>", "public"] },
-  { "symbol": [ "QDnsTlsAssociationRecord", "private", "<QDnsTlsAssociationRecord>", "public"] },
-  { "symbol": [ "QDockWidget", "private", "<QDockWidget>", "public"] },
-  { "symbol": [ "QDomAttr", "private", "<QDomAttr>", "public"] },
-  { "symbol": [ "QDomCDATASection", "private", "<QDomCDATASection>", "public"] },
-  { "symbol": [ "QDomCharacterData", "private", "<QDomCharacterData>", "public"] },
-  { "symbol": [ "QDomComment", "private", "<QDomComment>", "public"] },
-  { "symbol": [ "QDomDocument", "private", "<QDomDocument>", "public"] },
-  { "symbol": [ "QDomDocumentFragment", "private", "<QDomDocumentFragment>", "public"] },
-  { "symbol": [ "QDomDocumentType", "private", "<QDomDocumentType>", "public"] },
-  { "symbol": [ "QDomElement", "private", "<QDomElement>", "public"] },
-  { "symbol": [ "QDomEntity", "private", "<QDomEntity>", "public"] },
-  { "symbol": [ "QDomEntityReference", "private", "<QDomEntityReference>", "public"] },
-  { "symbol": [ "QDomImplementation", "private", "<QDomImplementation>", "public"] },
-  { "symbol": [ "QDomNamedNodeMap", "private", "<QDomNamedNodeMap>", "public"] },
-  { "symbol": [ "QDomNode", "private", "<QDomNode>", "public"] },
-  { "symbol": [ "QDomNodeList", "private", "<QDomNodeList>", "public"] },
-  { "symbol": [ "QDomNotation", "private", "<QDomNotation>", "public"] },
-  { "symbol": [ "QDomProcessingInstruction", "private", "<QDomProcessingInstruction>", "public"] },
-  { "symbol": [ "QDomText", "private", "<QDomText>", "public"] },
-  { "symbol": [ "QDoubleSpinBox", "private", "<QDoubleSpinBox>", "public"] },
-  { "symbol": [ "QDoubleValidator", "private", "<QDoubleValidator>", "public"] },
-  { "symbol": [ "QDrag", "private", "<QDrag>", "public"] },
-  { "symbol": [ "QDragEnterEvent", "private", "<QDragEnterEvent>", "public"] },
-  { "symbol": [ "QDragLeaveEvent", "private", "<QDragLeaveEvent>", "public"] },
-  { "symbol": [ "QDragMoveEvent", "private", "<QDragMoveEvent>", "public"] },
-  { "symbol": [ "QDropEvent", "private", "<QDropEvent>", "public"] },
-  { "symbol": [ "QDtls", "private", "<QDtls>", "public"] },
-  { "symbol": [ "QDtlsClientVerifier", "private", "<QDtlsClientVerifier>", "public"] },
-  { "symbol": [ "QDynamicPropertyChangeEvent", "private", "<QDynamicPropertyChangeEvent>", "public"] },
-  { "symbol": [ "QEasingCurve", "private", "<QEasingCurve>", "public"] },
-  { "symbol": [ "QElapsedTimer", "private", "<QElapsedTimer>", "public"] },
-  { "symbol": [ "QEnableSharedFromThis", "private", "<QEnableSharedFromThis>", "public"] },
-  { "symbol": [ "QEnterEvent", "private", "<QEnterEvent>", "public"] },
-  { "symbol": [ "QErrorMessage", "private", "<QErrorMessage>", "public"] },
-  { "symbol": [ "QEvent", "private", "<QEvent>", "public"] },
-  { "symbol": [ "QEventLoop", "private", "<QEventLoop>", "public"] },
-  { "symbol": [ "QEventLoopLocker", "private", "<QEventLoopLocker>", "public"] },
-  { "symbol": [ "QEventPoint", "private", "<QEventPoint>", "public"] },
-  { "symbol": [ "QEventTransition", "private", "<QEventTransition>", "public"] },
-  { "symbol": [ "QException", "private", "<QException>", "public"] },
-  { "symbol": [ "QExplicitlySharedDataPointer", "private", "<QExplicitlySharedDataPointer>", "public"] },
-  { "symbol": [ "QExposeEvent", "private", "<QExposeEvent>", "public"] },
-  { "symbol": [ "QFactoryInterface", "private", "<QFactoryInterface>", "public"] },
-  { "symbol": [ "QFile", "private", "<QFile>", "public"] },
-  { "symbol": [ "QFileDevice", "private", "<QFileDevice>", "public"] },
-  { "symbol": [ "QFileDialog", "private", "<QFileDialog>", "public"] },
-  { "symbol": [ "QFileIconProvider", "private", "<QFileIconProvider>", "public"] },
-  { "symbol": [ "QFileInfo", "private", "<QFileInfo>", "public"] },
-  { "symbol": [ "QFileInfoList", "private", "<QFileInfoList>", "public"] },
-  { "symbol": [ "QFileOpenEvent", "private", "<QFileOpenEvent>", "public"] },
-  { "symbol": [ "QFileSelector", "private", "<QFileSelector>", "public"] },
-  { "symbol": [ "QFileSystemModel", "private", "<QFileSystemModel>", "public"] },
-  { "symbol": [ "QFileSystemWatcher", "private", "<QFileSystemWatcher>", "public"] },
-  { "symbol": [ "QFinalState", "private", "<QFinalState>", "public"] },
-  { "symbol": [ "QFlag", "private", "<QFlag>", "public"] },
-  { "symbol": [ "QFlags", "private", "<QFlags>", "public"] },
-  { "symbol": [ "QFloat16", "private", "<QFloat16>", "public"] },
-  { "symbol": [ "QFocusEvent", "private", "<QFocusEvent>", "public"] },
-  { "symbol": [ "QFocusFrame", "private", "<QFocusFrame>", "public"] },
-  { "symbol": [ "QFont", "private", "<QFont>", "public"] },
-  { "symbol": [ "QFontComboBox", "private", "<QFontComboBox>", "public"] },
-  { "symbol": [ "QFontDatabase", "private", "<QFontDatabase>", "public"] },
-  { "symbol": [ "QFontDialog", "private", "<QFontDialog>", "public"] },
-  { "symbol": [ "QFontInfo", "private", "<QFontInfo>", "public"] },
-  { "symbol": [ "QFontMetrics", "private", "<QFontMetrics>", "public"] },
-  { "symbol": [ "QFontMetricsF", "private", "<QFontMetricsF>", "public"] },
-  { "symbol": [ "QFontVariableAxis", "private", "<QFontVariableAxis>", "public"] },
-  { "symbol": [ "QForeach", "private", "<QForeach>", "public"] },
-  { "symbol": [ "QFormDataBuilder", "private", "<QFormDataBuilder>", "public"] },
-  { "symbol": [ "QFormDataPartBuilder", "private", "<QFormDataPartBuilder>", "public"] },
-  { "symbol": [ "QFormLayout", "private", "<QFormLayout>", "public"] },
-  { "symbol": [ "QFrame", "private", "<QFrame>", "public"] },
-  { "symbol": [ "QFunctionPointer", "private", "<QFunctionPointer>", "public"] },
-  { "symbol": [ "QFuture", "private", "<QFuture>", "public"] },
-  { "symbol": [ "QFutureInterface", "private", "<QFutureInterface>", "public"] },
-  { "symbol": [ "QFutureInterfaceBase", "private", "<QFutureInterfaceBase>", "public"] },
-  { "symbol": [ "QFutureIterator", "private", "<QFutureIterator>", "public"] },
-  { "symbol": [ "QFutureSynchronizer", "private", "<QFutureSynchronizer>", "public"] },
-  { "symbol": [ "QFutureWatcher", "private", "<QFutureWatcher>", "public"] },
-  { "symbol": [ "QFutureWatcherBase", "private", "<QFutureWatcherBase>", "public"] },
-  { "symbol": [ "QGenericArgument", "private", "<QGenericArgument>", "public"] },
-  { "symbol": [ "QGenericMatrix", "private", "<QGenericMatrix>", "public"] },
-  { "symbol": [ "QGenericPlugin", "private", "<QGenericPlugin>", "public"] },
-  { "symbol": [ "QGenericPluginFactory", "private", "<QGenericPluginFactory>", "public"] },
-  { "symbol": [ "QGenericReturnArgument", "private", "<QGenericReturnArgument>", "public"] },
-  { "symbol": [ "QGesture", "private", "<QGesture>", "public"] },
-  { "symbol": [ "QGestureEvent", "private", "<QGestureEvent>", "public"] },
-  { "symbol": [ "QGestureRecognizer", "private", "<QGestureRecognizer>", "public"] },
-  { "symbol": [ "QGlobalStatic", "private", "<QGlobalStatic>", "public"] },
-  { "symbol": [ "QGlyphRun", "private", "<QGlyphRun>", "public"] },
-  { "symbol": [ "QGradient", "private", "<QGradient>", "public"] },
-  { "symbol": [ "QGradientStop", "private", "<QGradientStop>", "public"] },
-  { "symbol": [ "QGradientStops", "private", "<QGradientStops>", "public"] },
-  { "symbol": [ "QGraphicsAnchor", "private", "<QGraphicsAnchor>", "public"] },
-  { "symbol": [ "QGraphicsAnchorLayout", "private", "<QGraphicsAnchorLayout>", "public"] },
-  { "symbol": [ "QGraphicsBlurEffect", "private", "<QGraphicsBlurEffect>", "public"] },
-  { "symbol": [ "QGraphicsColorizeEffect", "private", "<QGraphicsColorizeEffect>", "public"] },
-  { "symbol": [ "QGraphicsDropShadowEffect", "private", "<QGraphicsDropShadowEffect>", "public"] },
-  { "symbol": [ "QGraphicsEffect", "private", "<QGraphicsEffect>", "public"] },
-  { "symbol": [ "QGraphicsEllipseItem", "private", "<QGraphicsEllipseItem>", "public"] },
-  { "symbol": [ "QGraphicsGridLayout", "private", "<QGraphicsGridLayout>", "public"] },
-  { "symbol": [ "QGraphicsItem", "private", "<QGraphicsItem>", "public"] },
-  { "symbol": [ "QGraphicsItemAnimation", "private", "<QGraphicsItemAnimation>", "public"] },
-  { "symbol": [ "QGraphicsItemGroup", "private", "<QGraphicsItemGroup>", "public"] },
-  { "symbol": [ "QGraphicsLayout", "private", "<QGraphicsLayout>", "public"] },
-  { "symbol": [ "QGraphicsLayoutItem", "private", "<QGraphicsLayoutItem>", "public"] },
-  { "symbol": [ "QGraphicsLineItem", "private", "<QGraphicsLineItem>", "public"] },
-  { "symbol": [ "QGraphicsLinearLayout", "private", "<QGraphicsLinearLayout>", "public"] },
-  { "symbol": [ "QGraphicsObject", "private", "<QGraphicsObject>", "public"] },
-  { "symbol": [ "QGraphicsOpacityEffect", "private", "<QGraphicsOpacityEffect>", "public"] },
-  { "symbol": [ "QGraphicsPathItem", "private", "<QGraphicsPathItem>", "public"] },
-  { "symbol": [ "QGraphicsPixmapItem", "private", "<QGraphicsPixmapItem>", "public"] },
-  { "symbol": [ "QGraphicsPolygonItem", "private", "<QGraphicsPolygonItem>", "public"] },
-  { "symbol": [ "QGraphicsProxyWidget", "private", "<QGraphicsProxyWidget>", "public"] },
-  { "symbol": [ "QGraphicsRectItem", "private", "<QGraphicsRectItem>", "public"] },
-  { "symbol": [ "QGraphicsRotation", "private", "<QGraphicsRotation>", "public"] },
-  { "symbol": [ "QGraphicsScale", "private", "<QGraphicsScale>", "public"] },
-  { "symbol": [ "QGraphicsScene", "private", "<QGraphicsScene>", "public"] },
-  { "symbol": [ "QGraphicsSceneContextMenuEvent", "private", "<QGraphicsSceneContextMenuEvent>", "public"] },
-  { "symbol": [ "QGraphicsSceneDragDropEvent", "private", "<QGraphicsSceneDragDropEvent>", "public"] },
-  { "symbol": [ "QGraphicsSceneEvent", "private", "<QGraphicsSceneEvent>", "public"] },
-  { "symbol": [ "QGraphicsSceneHelpEvent", "private", "<QGraphicsSceneHelpEvent>", "public"] },
-  { "symbol": [ "QGraphicsSceneHoverEvent", "private", "<QGraphicsSceneHoverEvent>", "public"] },
-  { "symbol": [ "QGraphicsSceneMouseEvent", "private", "<QGraphicsSceneMouseEvent>", "public"] },
-  { "symbol": [ "QGraphicsSceneMoveEvent", "private", "<QGraphicsSceneMoveEvent>", "public"] },
-  { "symbol": [ "QGraphicsSceneResizeEvent", "private", "<QGraphicsSceneResizeEvent>", "public"] },
-  { "symbol": [ "QGraphicsSceneWheelEvent", "private", "<QGraphicsSceneWheelEvent>", "public"] },
-  { "symbol": [ "QGraphicsSimpleTextItem", "private", "<QGraphicsSimpleTextItem>", "public"] },
-  { "symbol": [ "QGraphicsSvgItem", "private", "<QGraphicsSvgItem>", "public"] },
-  { "symbol": [ "QGraphicsTextItem", "private", "<QGraphicsTextItem>", "public"] },
-  { "symbol": [ "QGraphicsTransform", "private", "<QGraphicsTransform>", "public"] },
-  { "symbol": [ "QGraphicsVideoItem", "private", "<QGraphicsVideoItem>", "public"] },
-  { "symbol": [ "QGraphicsView", "private", "<QGraphicsView>", "public"] },
-  { "symbol": [ "QGraphicsWidget", "private", "<QGraphicsWidget>", "public"] },
-  { "symbol": [ "QGridLayout", "private", "<QGridLayout>", "public"] },
-  { "symbol": [ "QGroupBox", "private", "<QGroupBox>", "public"] },
-  { "symbol": [ "QGuiApplication", "private", "<QGuiApplication>", "public"] },
-  { "symbol": [ "QHBoxLayout", "private", "<QHBoxLayout>", "public"] },
-  { "symbol": [ "QHash", "private", "<QHash>", "public"] },
-  { "symbol": [ "QHashDummyValue", "private", "<QHashDummyValue>", "public"] },
-  { "symbol": [ "QHashFunctions", "private", "<QHashFunctions>", "public"] },
-  { "symbol": [ "QHashHeterogeneousSearch", "private", "<QHashHeterogeneousSearch>", "public"] },
-  { "symbol": [ "QHashIterator", "private", "<QHashIterator>", "public"] },
-  { "symbol": [ "QHashSeed", "private", "<QHashSeed>", "public"] },
-  { "symbol": [ "QHeaderView", "private", "<QHeaderView>", "public"] },
-  { "symbol": [ "QHelpContentItem", "private", "<QHelpContentItem>", "public"] },
-  { "symbol": [ "QHelpContentModel", "private", "<QHelpContentModel>", "public"] },
-  { "symbol": [ "QHelpContentWidget", "private", "<QHelpContentWidget>", "public"] },
-  { "symbol": [ "QHelpEngine", "private", "<QHelpEngine>", "public"] },
-  { "symbol": [ "QHelpEngineCore", "private", "<QHelpEngineCore>", "public"] },
-  { "symbol": [ "QHelpEvent", "private", "<QHelpEvent>", "public"] },
-  { "symbol": [ "QHelpFilterData", "private", "<QHelpFilterData>", "public"] },
-  { "symbol": [ "QHelpFilterEngine", "private", "<QHelpFilterEngine>", "public"] },
-  { "symbol": [ "QHelpFilterSettingsWidget", "private", "<QHelpFilterSettingsWidget>", "public"] },
-  { "symbol": [ "QHelpGlobal", "private", "<QHelpGlobal>", "public"] },
-  { "symbol": [ "QHelpIndexModel", "private", "<QHelpIndexModel>", "public"] },
-  { "symbol": [ "QHelpIndexWidget", "private", "<QHelpIndexWidget>", "public"] },
-  { "symbol": [ "QHelpLink", "private", "<QHelpLink>", "public"] },
-  { "symbol": [ "QHelpSearchEngine", "private", "<QHelpSearchEngine>", "public"] },
-  { "symbol": [ "QHelpSearchEngineCore", "private", "<QHelpSearchEngineCore>", "public"] },
-  { "symbol": [ "QHelpSearchQuery", "private", "<QHelpSearchQuery>", "public"] },
-  { "symbol": [ "QHelpSearchQueryWidget", "private", "<QHelpSearchQueryWidget>", "public"] },
-  { "symbol": [ "QHelpSearchResult", "private", "<QHelpSearchResult>", "public"] },
-  { "symbol": [ "QHelpSearchResultWidget", "private", "<QHelpSearchResultWidget>", "public"] },
-  { "symbol": [ "QHideEvent", "private", "<QHideEvent>", "public"] },
-  { "symbol": [ "QHistoryState", "private", "<QHistoryState>", "public"] },
-  { "symbol": [ "QHostAddress", "private", "<QHostAddress>", "public"] },
-  { "symbol": [ "QHostInfo", "private", "<QHostInfo>", "public"] },
-  { "symbol": [ "QHoverEvent", "private", "<QHoverEvent>", "public"] },
-  { "symbol": [ "QHstsPolicy", "private", "<QHstsPolicy>", "public"] },
-  { "symbol": [ "QHttp1Configuration", "private", "<QHttp1Configuration>", "public"] },
-  { "symbol": [ "QHttp2Configuration", "private", "<QHttp2Configuration>", "public"] },
-  { "symbol": [ "QHttpHeaders", "private", "<QHttpHeaders>", "public"] },
-  { "symbol": [ "QHttpMultiPart", "private", "<QHttpMultiPart>", "public"] },
-  { "symbol": [ "QHttpPart", "private", "<QHttpPart>", "public"] },
-  { "symbol": [ "QIODevice", "private", "<QIODevice>", "public"] },
-  { "symbol": [ "QIODeviceBase", "private", "<QIODeviceBase>", "public"] },
-  { "symbol": [ "QIPv6Address", "private", "<QIPv6Address>", "public"] },
-  { "symbol": [ "QIcon", "private", "<QIcon>", "public"] },
-  { "symbol": [ "QIconDragEvent", "private", "<QIconDragEvent>", "public"] },
-  { "symbol": [ "QIconEngine", "private", "<QIconEngine>", "public"] },
-  { "symbol": [ "QIconEnginePlugin", "private", "<QIconEnginePlugin>", "public"] },
-  { "symbol": [ "QIdentityProxyModel", "private", "<QIdentityProxyModel>", "public"] },
-  { "symbol": [ "QImage", "private", "<QImage>", "public"] },
-  { "symbol": [ "QImageCapture", "private", "<QImageCapture>", "public"] },
-  { "symbol": [ "QImageCleanupFunction", "private", "<QImageCleanupFunction>", "public"] },
-  { "symbol": [ "QImageIOHandler", "private", "<QImageIOHandler>", "public"] },
-  { "symbol": [ "QImageIOPlugin", "private", "<QImageIOPlugin>", "public"] },
-  { "symbol": [ "QImageReader", "private", "<QImageReader>", "public"] },
-  { "symbol": [ "QImageWriter", "private", "<QImageWriter>", "public"] },
-  { "symbol": [ "QIncompatibleFlag", "private", "<QIncompatibleFlag>", "public"] },
-  { "symbol": [ "QInputDevice", "private", "<QInputDevice>", "public"] },
-  { "symbol": [ "QInputDialog", "private", "<QInputDialog>", "public"] },
-  { "symbol": [ "QInputEvent", "private", "<QInputEvent>", "public"] },
-  { "symbol": [ "QInputMethod", "private", "<QInputMethod>", "public"] },
-  { "symbol": [ "QInputMethodEvent", "private", "<QInputMethodEvent>", "public"] },
-  { "symbol": [ "QInputMethodQueryEvent", "private", "<QInputMethodQueryEvent>", "public"] },
-  { "symbol": [ "QIntValidator", "private", "<QIntValidator>", "public"] },
-  { "symbol": [ "QInternal", "private", "<QInternal>", "public"] },
-  { "symbol": [ "QItemDelegate", "private", "<QItemDelegate>", "public"] },
-  { "symbol": [ "QItemEditorCreator", "private", "<QItemEditorCreator>", "public"] },
-  { "symbol": [ "QItemEditorCreatorBase", "private", "<QItemEditorCreatorBase>", "public"] },
-  { "symbol": [ "QItemEditorFactory", "private", "<QItemEditorFactory>", "public"] },
-  { "symbol": [ "QItemSelection", "private", "<QItemSelection>", "public"] },
-  { "symbol": [ "QItemSelectionModel", "private", "<QItemSelectionModel>", "public"] },
-  { "symbol": [ "QItemSelectionRange", "private", "<QItemSelectionRange>", "public"] },
-  { "symbol": [ "QIterable", "private", "<QIterable>", "public"] },
-  { "symbol": [ "QIterator", "private", "<QIterator>", "public"] },
-  { "symbol": [ "QJSEngine", "private", "<QJSEngine>", "public"] },
-  { "symbol": [ "QJSList", "private", "<QJSList>", "public"] },
-  { "symbol": [ "QJSListForInIterator", "private", "<QJSListForInIterator>", "public"] },
-  { "symbol": [ "QJSListForOfIterator", "private", "<QJSListForOfIterator>", "public"] },
-  { "symbol": [ "QJSListIndexClamp", "private", "<QJSListIndexClamp>", "public"] },
-  { "symbol": [ "QJSManagedValue", "private", "<QJSManagedValue>", "public"] },
-  { "symbol": [ "QJSNumberCoercion", "private", "<QJSNumberCoercion>", "public"] },
-  { "symbol": [ "QJSPrimitiveValue", "private", "<QJSPrimitiveValue>", "public"] },
-  { "symbol": [ "QJSValue", "private", "<QJSValue>", "public"] },
-  { "symbol": [ "QJSValueIterator", "private", "<QJSValueIterator>", "public"] },
-  { "symbol": [ "QJSValueList", "private", "<QJSValueList>", "public"] },
-  { "symbol": [ "QJsonArray", "private", "<QJsonArray>", "public"] },
-  { "symbol": [ "QJsonDocument", "private", "<QJsonDocument>", "public"] },
-  { "symbol": [ "QJsonObject", "private", "<QJsonObject>", "public"] },
-  { "symbol": [ "QJsonParseError", "private", "<QJsonParseError>", "public"] },
-  { "symbol": [ "QJsonValue", "private", "<QJsonValue>", "public"] },
-  { "symbol": [ "QJsonValueConstRef", "private", "<QJsonValueConstRef>", "public"] },
-  { "symbol": [ "QJsonValueRef", "private", "<QJsonValueRef>", "public"] },
-  { "symbol": [ "QKeyCombination", "private", "<QKeyCombination>", "public"] },
-  { "symbol": [ "QKeyEvent", "private", "<QKeyEvent>", "public"] },
-  { "symbol": [ "QKeyEventTransition", "private", "<QKeyEventTransition>", "public"] },
-  { "symbol": [ "QKeySequence", "private", "<QKeySequence>", "public"] },
-  { "symbol": [ "QKeySequenceEdit", "private", "<QKeySequenceEdit>", "public"] },
-  { "symbol": [ "QKeyValueIterator", "private", "<QKeyValueIterator>", "public"] },
-  { "symbol": [ "QLCDNumber", "private", "<QLCDNumber>", "public"] },
-  { "symbol": [ "QLEInteger", "private", "<QLEInteger>", "public"] },
-  { "symbol": [ "QLabel", "private", "<QLabel>", "public"] },
-  { "symbol": [ "QLatin1Char", "private", "<QLatin1Char>", "public"] },
-  { "symbol": [ "QLatin1String", "private", "<QLatin1String>", "public"] },
-  { "symbol": [ "QLatin1StringMatcher", "private", "<QLatin1StringMatcher>", "public"] },
-  { "symbol": [ "QLatin1StringView", "private", "<QLatin1StringView>", "public"] },
-  { "symbol": [ "QLayout", "private", "<QLayout>", "public"] },
-  { "symbol": [ "QLayoutItem", "private", "<QLayoutItem>", "public"] },
-  { "symbol": [ "QLibrary", "private", "<QLibrary>", "public"] },
-  { "symbol": [ "QLibraryInfo", "private", "<QLibraryInfo>", "public"] },
-  { "symbol": [ "QLine", "private", "<QLine>", "public"] },
-  { "symbol": [ "QLineEdit", "private", "<QLineEdit>", "public"] },
-  { "symbol": [ "QLineF", "private", "<QLineF>", "public"] },
-  { "symbol": [ "QLinearGradient", "private", "<QLinearGradient>", "public"] },
-  { "symbol": [ "QLinkedList", "private", "<QLinkedList>", "public"] },
-  { "symbol": [ "QLinkedListData", "private", "<QLinkedListData>", "public"] },
-  { "symbol": [ "QLinkedListIterator", "private", "<QLinkedListIterator>", "public"] },
-  { "symbol": [ "QLinkedListNode", "private", "<QLinkedListNode>", "public"] },
-  { "symbol": [ "QList", "private", "<QList>", "public"] },
-  { "symbol": [ "QListIterator", "private", "<QListIterator>", "public"] },
-  { "symbol": [ "QListSpecialMethods", "private", "<QListSpecialMethods>", "public"] },
-  { "symbol": [ "QListSpecialMethodsBase", "private", "<QListSpecialMethodsBase>", "public"] },
-  { "symbol": [ "QListView", "private", "<QListView>", "public"] },
-  { "symbol": [ "QListWidget", "private", "<QListWidget>", "public"] },
-  { "symbol": [ "QListWidgetItem", "private", "<QListWidgetItem>", "public"] },
-  { "symbol": [ "QLittleEndianStorageType", "private", "<QLittleEndianStorageType>", "public"] },
-  { "symbol": [ "QLocalServer", "private", "<QLocalServer>", "public"] },
-  { "symbol": [ "QLocalSocket", "private", "<QLocalSocket>", "public"] },
-  { "symbol": [ "QLocale", "private", "<QLocale>", "public"] },
-  { "symbol": [ "QLocationPermission", "private", "<QLocationPermission>", "public"] },
-  { "symbol": [ "QLockFile", "private", "<QLockFile>", "public"] },
-  { "symbol": [ "QLoggingCategory", "private", "<QLoggingCategory>", "public"] },
-  { "symbol": [ "QLowEnergyAdvertisingData", "private", "<QLowEnergyAdvertisingData>", "public"] },
-  { "symbol": [ "QLowEnergyAdvertisingParameters", "private", "<QLowEnergyAdvertisingParameters>", "public"] },
-  { "symbol": [ "QLowEnergyCharacteristic", "private", "<QLowEnergyCharacteristic>", "public"] },
-  { "symbol": [ "QLowEnergyCharacteristicData", "private", "<QLowEnergyCharacteristicData>", "public"] },
-  { "symbol": [ "QLowEnergyConnectionParameters", "private", "<QLowEnergyConnectionParameters>", "public"] },
-  { "symbol": [ "QLowEnergyController", "private", "<QLowEnergyController>", "public"] },
-  { "symbol": [ "QLowEnergyDescriptor", "private", "<QLowEnergyDescriptor>", "public"] },
-  { "symbol": [ "QLowEnergyDescriptorData", "private", "<QLowEnergyDescriptorData>", "public"] },
-  { "symbol": [ "QLowEnergyHandle", "private", "<QLowEnergyHandle>", "public"] },
-  { "symbol": [ "QLowEnergyService", "private", "<QLowEnergyService>", "public"] },
-  { "symbol": [ "QLowEnergyServiceData", "private", "<QLowEnergyServiceData>", "public"] },
-  { "symbol": [ "QMainWindow", "private", "<QMainWindow>", "public"] },
-  { "symbol": [ "QMap", "private", "<QMap>", "public"] },
-  { "symbol": [ "QMapData", "private", "<QMapData>", "public"] },
-  { "symbol": [ "QMapIterator", "private", "<QMapIterator>", "public"] },
-  { "symbol": [ "QMargins", "private", "<QMargins>", "public"] },
-  { "symbol": [ "QMarginsF", "private", "<QMarginsF>", "public"] },
-  { "symbol": [ "QMaskGenerator", "private", "<QMaskGenerator>", "public"] },
-  { "symbol": [ "QMatrix2x2", "private", "<QMatrix2x2>", "public"] },
-  { "symbol": [ "QMatrix2x3", "private", "<QMatrix2x3>", "public"] },
-  { "symbol": [ "QMatrix2x4", "private", "<QMatrix2x4>", "public"] },
-  { "symbol": [ "QMatrix3x2", "private", "<QMatrix3x2>", "public"] },
-  { "symbol": [ "QMatrix3x3", "private", "<QMatrix3x3>", "public"] },
-  { "symbol": [ "QMatrix3x4", "private", "<QMatrix3x4>", "public"] },
-  { "symbol": [ "QMatrix4x2", "private", "<QMatrix4x2>", "public"] },
-  { "symbol": [ "QMatrix4x3", "private", "<QMatrix4x3>", "public"] },
-  { "symbol": [ "QMatrix4x4", "private", "<QMatrix4x4>", "public"] },
-  { "symbol": [ "QMdiArea", "private", "<QMdiArea>", "public"] },
-  { "symbol": [ "QMdiSubWindow", "private", "<QMdiSubWindow>", "public"] },
-  { "symbol": [ "QMediaCaptureSession", "private", "<QMediaCaptureSession>", "public"] },
-  { "symbol": [ "QMediaDevices", "private", "<QMediaDevices>", "public"] },
-  { "symbol": [ "QMediaFormat", "private", "<QMediaFormat>", "public"] },
-  { "symbol": [ "QMediaMetaData", "private", "<QMediaMetaData>", "public"] },
-  { "symbol": [ "QMediaPlayer", "private", "<QMediaPlayer>", "public"] },
-  { "symbol": [ "QMediaRecorder", "private", "<QMediaRecorder>", "public"] },
-  { "symbol": [ "QMediaTimeRange", "private", "<QMediaTimeRange>", "public"] },
-  { "symbol": [ "QMenu", "private", "<QMenu>", "public"] },
-  { "symbol": [ "QMenuBar", "private", "<QMenuBar>", "public"] },
-  { "symbol": [ "QMessageAuthenticationCode", "private", "<QMessageAuthenticationCode>", "public"] },
-  { "symbol": [ "QMessageBox", "private", "<QMessageBox>", "public"] },
-  { "symbol": [ "QMessageLogContext", "private", "<QMessageLogContext>", "public"] },
-  { "symbol": [ "QMessageLogger", "private", "<QMessageLogger>", "public"] },
-  { "symbol": [ "QMetaAssociation", "private", "<QMetaAssociation>", "public"] },
-  { "symbol": [ "QMetaClassInfo", "private", "<QMetaClassInfo>", "public"] },
-  { "symbol": [ "QMetaContainer", "private", "<QMetaContainer>", "public"] },
-  { "symbol": [ "QMetaEnum", "private", "<QMetaEnum>", "public"] },
-  { "symbol": [ "QMetaMethod", "private", "<QMetaMethod>", "public"] },
-  { "symbol": [ "QMetaMethodArgument", "private", "<QMetaMethodArgument>", "public"] },
-  { "symbol": [ "QMetaMethodReturnArgument", "private", "<QMetaMethodReturnArgument>", "public"] },
-  { "symbol": [ "QMetaObject", "private", "<QMetaObject>", "public"] },
-  { "symbol": [ "QMetaProperty", "private", "<QMetaProperty>", "public"] },
-  { "symbol": [ "QMetaSequence", "private", "<QMetaSequence>", "public"] },
-  { "symbol": [ "QMetaType", "private", "<QMetaType>", "public"] },
-  { "symbol": [ "QMetaTypeId", "private", "<QMetaTypeId>", "public"] },
-  { "symbol": [ "QMetaTypeId2", "private", "<QMetaTypeId2>", "public"] },
-  { "symbol": [ "QMetaTypeIdQObject", "private", "<QMetaTypeIdQObject>", "public"] },
-  { "symbol": [ "QMethodRawArguments", "private", "<QMethodRawArguments>", "public"] },
-  { "symbol": [ "QMimeData", "private", "<QMimeData>", "public"] },
-  { "symbol": [ "QMimeDatabase", "private", "<QMimeDatabase>", "public"] },
-  { "symbol": [ "QMimeType", "private", "<QMimeType>", "public"] },
-  { "symbol": [ "QModelIndex", "private", "<QModelIndex>", "public"] },
-  { "symbol": [ "QModelIndexList", "private", "<QModelIndexList>", "public"] },
-  { "symbol": [ "QModelRoleData", "private", "<QModelRoleData>", "public"] },
-  { "symbol": [ "QModelRoleDataSpan", "private", "<QModelRoleDataSpan>", "public"] },
-  { "symbol": [ "QMouseEvent", "private", "<QMouseEvent>", "public"] },
-  { "symbol": [ "QMouseEventTransition", "private", "<QMouseEventTransition>", "public"] },
-  { "symbol": [ "QMoveEvent", "private", "<QMoveEvent>", "public"] },
-  { "symbol": [ "QMovie", "private", "<QMovie>", "public"] },
-  { "symbol": [ "QMultiHash", "private", "<QMultiHash>", "public"] },
-  { "symbol": [ "QMultiHashIterator", "private", "<QMultiHashIterator>", "public"] },
-  { "symbol": [ "QMultiMap", "private", "<QMultiMap>", "public"] },
-  { "symbol": [ "QMultiMapIterator", "private", "<QMultiMapIterator>", "public"] },
-  { "symbol": [ "QMutableByteArrayListIterator", "private", "<QMutableByteArrayListIterator>", "public"] },
-  { "symbol": [ "QMutableFutureIterator", "private", "<QMutableFutureIterator>", "public"] },
-  { "symbol": [ "QMutableHashIterator", "private", "<QMutableHashIterator>", "public"] },
-  { "symbol": [ "QMutableLinkedListIterator", "private", "<QMutableLinkedListIterator>", "public"] },
-  { "symbol": [ "QMutableListIterator", "private", "<QMutableListIterator>", "public"] },
-  { "symbol": [ "QMutableMapIterator", "private", "<QMutableMapIterator>", "public"] },
-  { "symbol": [ "QMutableMultiHashIterator", "private", "<QMutableMultiHashIterator>", "public"] },
-  { "symbol": [ "QMutableMultiMapIterator", "private", "<QMutableMultiMapIterator>", "public"] },
-  { "symbol": [ "QMutableSetIterator", "private", "<QMutableSetIterator>", "public"] },
-  { "symbol": [ "QMutableVectorIterator", "private", "<QMutableVectorIterator>", "public"] },
-  { "symbol": [ "QMutex", "private", "<QMutex>", "public"] },
-  { "symbol": [ "QMutexLocker", "private", "<QMutexLocker>", "public"] },
-  { "symbol": [ "QNativeGestureEvent", "private", "<QNativeGestureEvent>", "public"] },
-  { "symbol": [ "QNativeIpcKey", "private", "<QNativeIpcKey>", "public"] },
-  { "symbol": [ "QNetworkAccessManager", "private", "<QNetworkAccessManager>", "public"] },
-  { "symbol": [ "QNetworkAddressEntry", "private", "<QNetworkAddressEntry>", "public"] },
-  { "symbol": [ "QNetworkCacheMetaData", "private", "<QNetworkCacheMetaData>", "public"] },
-  { "symbol": [ "QNetworkCookie", "private", "<QNetworkCookie>", "public"] },
-  { "symbol": [ "QNetworkCookieJar", "private", "<QNetworkCookieJar>", "public"] },
-  { "symbol": [ "QNetworkDatagram", "private", "<QNetworkDatagram>", "public"] },
-  { "symbol": [ "QNetworkDiskCache", "private", "<QNetworkDiskCache>", "public"] },
-  { "symbol": [ "QNetworkInformation", "private", "<QNetworkInformation>", "public"] },
-  { "symbol": [ "QNetworkInterface", "private", "<QNetworkInterface>", "public"] },
-  { "symbol": [ "QNetworkProxy", "private", "<QNetworkProxy>", "public"] },
-  { "symbol": [ "QNetworkProxyFactory", "private", "<QNetworkProxyFactory>", "public"] },
-  { "symbol": [ "QNetworkProxyQuery", "private", "<QNetworkProxyQuery>", "public"] },
-  { "symbol": [ "QNetworkReply", "private", "<QNetworkReply>", "public"] },
-  { "symbol": [ "QNetworkRequest", "private", "<QNetworkRequest>", "public"] },
-  { "symbol": [ "QNetworkRequestFactory", "private", "<QNetworkRequestFactory>", "public"] },
-  { "symbol": [ "QNoDebug", "private", "<QNoDebug>", "public"] },
-  { "symbol": [ "QNtfsPermissionCheckGuard", "private", "<QNtfsPermissionCheckGuard>", "public"] },
-  { "symbol": [ "QOAuth1", "private", "<QOAuth1>", "public"] },
-  { "symbol": [ "QOAuth1Signature", "private", "<QOAuth1Signature>", "public"] },
-  { "symbol": [ "QOAuth2AuthorizationCodeFlow", "private", "<QOAuth2AuthorizationCodeFlow>", "public"] },
-  { "symbol": [ "QOAuth2DeviceAuthorizationFlow", "private", "<QOAuth2DeviceAuthorizationFlow>", "public"] },
-  { "symbol": [ "QOAuthHttpServerReplyHandler", "private", "<QOAuthHttpServerReplyHandler>", "public"] },
-  { "symbol": [ "QOAuthOobReplyHandler", "private", "<QOAuthOobReplyHandler>", "public"] },
-  { "symbol": [ "QOAuthUriSchemeReplyHandler", "private", "<QOAuthUriSchemeReplyHandler>", "public"] },
-  { "symbol": [ "QObject", "private", "<QObject>", "public"] },
-  { "symbol": [ "QObjectBindableProperty", "private", "<QObjectBindableProperty>", "public"] },
-  { "symbol": [ "QObjectCleanupHandler", "private", "<QObjectCleanupHandler>", "public"] },
-  { "symbol": [ "QObjectComputedProperty", "private", "<QObjectComputedProperty>", "public"] },
-  { "symbol": [ "QObjectData", "private", "<QObjectData>", "public"] },
-  { "symbol": [ "QObjectList", "private", "<QObjectList>", "public"] },
-  { "symbol": [ "QOcspResponse", "private", "<QOcspResponse>", "public"] },
-  { "symbol": [ "QOffscreenSurface", "private", "<QOffscreenSurface>", "public"] },
-  { "symbol": [ "QOpenGLBuffer", "private", "<QOpenGLBuffer>", "public"] },
-  { "symbol": [ "QOpenGLContext", "private", "<QOpenGLContext>", "public"] },
-  { "symbol": [ "QOpenGLContextGroup", "private", "<QOpenGLContextGroup>", "public"] },
-  { "symbol": [ "QOpenGLDebugLogger", "private", "<QOpenGLDebugLogger>", "public"] },
-  { "symbol": [ "QOpenGLDebugMessage", "private", "<QOpenGLDebugMessage>", "public"] },
-  { "symbol": [ "QOpenGLExtraFunctions", "private", "<QOpenGLExtraFunctions>", "public"] },
-  { "symbol": [ "QOpenGLExtraFunctionsPrivate", "private", "<QOpenGLExtraFunctionsPrivate>", "public"] },
-  { "symbol": [ "QOpenGLFramebufferObject", "private", "<QOpenGLFramebufferObject>", "public"] },
-  { "symbol": [ "QOpenGLFramebufferObjectFormat", "private", "<QOpenGLFramebufferObjectFormat>", "public"] },
-  { "symbol": [ "QOpenGLFunctions", "private", "<QOpenGLFunctions>", "public"] },
-  { "symbol": [ "QOpenGLFunctionsPrivate", "private", "<QOpenGLFunctionsPrivate>", "public"] },
-  { "symbol": [ "QOpenGLFunctions_1_0", "private", "<QOpenGLFunctions_1_0>", "public"] },
-  { "symbol": [ "QOpenGLFunctions_1_1", "private", "<QOpenGLFunctions_1_1>", "public"] },
-  { "symbol": [ "QOpenGLFunctions_1_2", "private", "<QOpenGLFunctions_1_2>", "public"] },
-  { "symbol": [ "QOpenGLFunctions_1_3", "private", "<QOpenGLFunctions_1_3>", "public"] },
-  { "symbol": [ "QOpenGLFunctions_1_4", "private", "<QOpenGLFunctions_1_4>", "public"] },
-  { "symbol": [ "QOpenGLFunctions_1_5", "private", "<QOpenGLFunctions_1_5>", "public"] },
-  { "symbol": [ "QOpenGLFunctions_2_0", "private", "<QOpenGLFunctions_2_0>", "public"] },
-  { "symbol": [ "QOpenGLFunctions_2_1", "private", "<QOpenGLFunctions_2_1>", "public"] },
-  { "symbol": [ "QOpenGLFunctions_3_0", "private", "<QOpenGLFunctions_3_0>", "public"] },
-  { "symbol": [ "QOpenGLFunctions_3_1", "private", "<QOpenGLFunctions_3_1>", "public"] },
-  { "symbol": [ "QOpenGLFunctions_3_2_Compatibility", "private", "<QOpenGLFunctions_3_2_Compatibility>", "public"] },
-  { "symbol": [ "QOpenGLFunctions_3_2_Core", "private", "<QOpenGLFunctions_3_2_Core>", "public"] },
-  { "symbol": [ "QOpenGLFunctions_3_3_Compatibility", "private", "<QOpenGLFunctions_3_3_Compatibility>", "public"] },
-  { "symbol": [ "QOpenGLFunctions_3_3_Core", "private", "<QOpenGLFunctions_3_3_Core>", "public"] },
-  { "symbol": [ "QOpenGLFunctions_4_0_Compatibility", "private", "<QOpenGLFunctions_4_0_Compatibility>", "public"] },
-  { "symbol": [ "QOpenGLFunctions_4_0_Core", "private", "<QOpenGLFunctions_4_0_Core>", "public"] },
-  { "symbol": [ "QOpenGLFunctions_4_1_Compatibility", "private", "<QOpenGLFunctions_4_1_Compatibility>", "public"] },
-  { "symbol": [ "QOpenGLFunctions_4_1_Core", "private", "<QOpenGLFunctions_4_1_Core>", "public"] },
-  { "symbol": [ "QOpenGLFunctions_4_2_Compatibility", "private", "<QOpenGLFunctions_4_2_Compatibility>", "public"] },
-  { "symbol": [ "QOpenGLFunctions_4_2_Core", "private", "<QOpenGLFunctions_4_2_Core>", "public"] },
-  { "symbol": [ "QOpenGLFunctions_4_3_Compatibility", "private", "<QOpenGLFunctions_4_3_Compatibility>", "public"] },
-  { "symbol": [ "QOpenGLFunctions_4_3_Core", "private", "<QOpenGLFunctions_4_3_Core>", "public"] },
-  { "symbol": [ "QOpenGLFunctions_4_4_Compatibility", "private", "<QOpenGLFunctions_4_4_Compatibility>", "public"] },
-  { "symbol": [ "QOpenGLFunctions_4_4_Core", "private", "<QOpenGLFunctions_4_4_Core>", "public"] },
-  { "symbol": [ "QOpenGLFunctions_4_5_Compatibility", "private", "<QOpenGLFunctions_4_5_Compatibility>", "public"] },
-  { "symbol": [ "QOpenGLFunctions_4_5_Core", "private", "<QOpenGLFunctions_4_5_Core>", "public"] },
-  { "symbol": [ "QOpenGLPaintDevice", "private", "<QOpenGLPaintDevice>", "public"] },
-  { "symbol": [ "QOpenGLPixelTransferOptions", "private", "<QOpenGLPixelTransferOptions>", "public"] },
-  { "symbol": [ "QOpenGLShader", "private", "<QOpenGLShader>", "public"] },
-  { "symbol": [ "QOpenGLShaderProgram", "private", "<QOpenGLShaderProgram>", "public"] },
-  { "symbol": [ "QOpenGLTexture", "private", "<QOpenGLTexture>", "public"] },
-  { "symbol": [ "QOpenGLTextureBlitter", "private", "<QOpenGLTextureBlitter>", "public"] },
-  { "symbol": [ "QOpenGLTimeMonitor", "private", "<QOpenGLTimeMonitor>", "public"] },
-  { "symbol": [ "QOpenGLTimerQuery", "private", "<QOpenGLTimerQuery>", "public"] },
-  { "symbol": [ "QOpenGLVersionFunctions", "private", "<QOpenGLVersionFunctions>", "public"] },
-  { "symbol": [ "QOpenGLVersionFunctionsFactory", "private", "<QOpenGLVersionFunctionsFactory>", "public"] },
-  { "symbol": [ "QOpenGLVersionProfile", "private", "<QOpenGLVersionProfile>", "public"] },
-  { "symbol": [ "QOpenGLVertexArrayObject", "private", "<QOpenGLVertexArrayObject>", "public"] },
-  { "symbol": [ "QOpenGLWidget", "private", "<QOpenGLWidget>", "public"] },
-  { "symbol": [ "QOpenGLWindow", "private", "<QOpenGLWindow>", "public"] },
-  { "symbol": [ "QOperatingSystemVersion", "private", "<QOperatingSystemVersion>", "public"] },
-  { "symbol": [ "QOperatingSystemVersionBase", "private", "<QOperatingSystemVersionBase>", "public"] },
-  { "symbol": [ "QOperatingSystemVersionUnexported", "private", "<QOperatingSystemVersionUnexported>", "public"] },
-  { "symbol": [ "QPageLayout", "private", "<QPageLayout>", "public"] },
-  { "symbol": [ "QPageRanges", "private", "<QPageRanges>", "public"] },
-  { "symbol": [ "QPageSetupDialog", "private", "<QPageSetupDialog>", "public"] },
-  { "symbol": [ "QPageSize", "private", "<QPageSize>", "public"] },
-  { "symbol": [ "QPagedPaintDevice", "private", "<QPagedPaintDevice>", "public"] },
-  { "symbol": [ "QPaintDevice", "private", "<QPaintDevice>", "public"] },
-  { "symbol": [ "QPaintDeviceWindow", "private", "<QPaintDeviceWindow>", "public"] },
-  { "symbol": [ "QPaintEngine", "private", "<QPaintEngine>", "public"] },
-  { "symbol": [ "QPaintEngineState", "private", "<QPaintEngineState>", "public"] },
-  { "symbol": [ "QPaintEvent", "private", "<QPaintEvent>", "public"] },
-  { "symbol": [ "QPainter", "private", "<QPainter>", "public"] },
-  { "symbol": [ "QPainterPath", "private", "<QPainterPath>", "public"] },
-  { "symbol": [ "QPainterPathStroker", "private", "<QPainterPathStroker>", "public"] },
-  { "symbol": [ "QPainterStateGuard", "private", "<QPainterStateGuard>", "public"] },
-  { "symbol": [ "QPair", "private", "<QPair>", "public"] },
-  { "symbol": [ "QPalette", "private", "<QPalette>", "public"] },
-  { "symbol": [ "QPanGesture", "private", "<QPanGesture>", "public"] },
-  { "symbol": [ "QParallelAnimationGroup", "private", "<QParallelAnimationGroup>", "public"] },
-  { "symbol": [ "QPartialOrdering", "private", "<QPartialOrdering>", "public"] },
-  { "symbol": [ "QPasswordDigestor", "private", "<QPasswordDigestor>", "public"] },
-  { "symbol": [ "QPauseAnimation", "private", "<QPauseAnimation>", "public"] },
-  { "symbol": [ "QPdfBookmarkModel", "private", "<QPdfBookmarkModel>", "public"] },
-  { "symbol": [ "QPdfDocument", "private", "<QPdfDocument>", "public"] },
-  { "symbol": [ "QPdfDocumentRenderOptions", "private", "<QPdfDocumentRenderOptions>", "public"] },
-  { "symbol": [ "QPdfLink", "private", "<QPdfLink>", "public"] },
-  { "symbol": [ "QPdfLinkModel", "private", "<QPdfLinkModel>", "public"] },
-  { "symbol": [ "QPdfOutputIntent", "private", "<QPdfOutputIntent>", "public"] },
-  { "symbol": [ "QPdfPageNavigator", "private", "<QPdfPageNavigator>", "public"] },
-  { "symbol": [ "QPdfPageRenderer", "private", "<QPdfPageRenderer>", "public"] },
-  { "symbol": [ "QPdfPageSelector", "private", "<QPdfPageSelector>", "public"] },
-  { "symbol": [ "QPdfSearchModel", "private", "<QPdfSearchModel>", "public"] },
-  { "symbol": [ "QPdfSelection", "private", "<QPdfSelection>", "public"] },
-  { "symbol": [ "QPdfView", "private", "<QPdfView>", "public"] },
-  { "symbol": [ "QPdfWriter", "private", "<QPdfWriter>", "public"] },
-  { "symbol": [ "QPen", "private", "<QPen>", "public"] },
-  { "symbol": [ "QPermission", "private", "<QPermission>", "public"] },
-  { "symbol": [ "QPermissions", "private", "<QPermissions>", "public"] },
-  { "symbol": [ "QPersistentModelIndex", "private", "<QPersistentModelIndex>", "public"] },
-  { "symbol": [ "QPicture", "private", "<QPicture>", "public"] },
-  { "symbol": [ "QPinchGesture", "private", "<QPinchGesture>", "public"] },
-  { "symbol": [ "QPixelFormat", "private", "<QPixelFormat>", "public"] },
-  { "symbol": [ "QPixmap", "private", "<QPixmap>", "public"] },
-  { "symbol": [ "QPixmapCache", "private", "<QPixmapCache>", "public"] },
-  { "symbol": [ "QPlainTextDocumentLayout", "private", "<QPlainTextDocumentLayout>", "public"] },
-  { "symbol": [ "QPlainTextEdit", "private", "<QPlainTextEdit>", "public"] },
-  { "symbol": [ "QPlatformSurfaceEvent", "private", "<QPlatformSurfaceEvent>", "public"] },
-  { "symbol": [ "QPlaybackOptions", "private", "<QPlaybackOptions>", "public"] },
-  { "symbol": [ "QPluginLoader", "private", "<QPluginLoader>", "public"] },
-  { "symbol": [ "QPluginMetaData", "private", "<QPluginMetaData>", "public"] },
-  { "symbol": [ "QPluginMetaDataV2", "private", "<QPluginMetaDataV2>", "public"] },
-  { "symbol": [ "QPoint", "private", "<QPoint>", "public"] },
-  { "symbol": [ "QPointF", "private", "<QPointF>", "public"] },
-  { "symbol": [ "QPointer", "private", "<QPointer>", "public"] },
-  { "symbol": [ "QPointerEvent", "private", "<QPointerEvent>", "public"] },
-  { "symbol": [ "QPointingDevice", "private", "<QPointingDevice>", "public"] },
-  { "symbol": [ "QPointingDeviceUniqueId", "private", "<QPointingDeviceUniqueId>", "public"] },
-  { "symbol": [ "QPolygon", "private", "<QPolygon>", "public"] },
-  { "symbol": [ "QPolygonF", "private", "<QPolygonF>", "public"] },
-  { "symbol": [ "QPrintDialog", "private", "<QPrintDialog>", "public"] },
-  { "symbol": [ "QPrintEngine", "private", "<QPrintEngine>", "public"] },
-  { "symbol": [ "QPrintPreviewDialog", "private", "<QPrintPreviewDialog>", "public"] },
-  { "symbol": [ "QPrintPreviewWidget", "private", "<QPrintPreviewWidget>", "public"] },
-  { "symbol": [ "QPrinter", "private", "<QPrinter>", "public"] },
-  { "symbol": [ "QPrinterInfo", "private", "<QPrinterInfo>", "public"] },
-  { "symbol": [ "QProcess", "private", "<QProcess>", "public"] },
-  { "symbol": [ "QProcessEnvironment", "private", "<QProcessEnvironment>", "public"] },
-  { "symbol": [ "QProgressBar", "private", "<QProgressBar>", "public"] },
-  { "symbol": [ "QProgressDialog", "private", "<QProgressDialog>", "public"] },
-  { "symbol": [ "QPromise", "private", "<QPromise>", "public"] },
-  { "symbol": [ "QProperty", "private", "<QProperty>", "public"] },
-  { "symbol": [ "QPropertyAnimation", "private", "<QPropertyAnimation>", "public"] },
-  { "symbol": [ "QPropertyBinding", "private", "<QPropertyBinding>", "public"] },
-  { "symbol": [ "QPropertyBindingError", "private", "<QPropertyBindingError>", "public"] },
-  { "symbol": [ "QPropertyBindingPrivatePtr", "private", "<QPropertyBindingPrivatePtr>", "public"] },
-  { "symbol": [ "QPropertyBindingSourceLocation", "private", "<QPropertyBindingSourceLocation>", "public"] },
-  { "symbol": [ "QPropertyChangeHandler", "private", "<QPropertyChangeHandler>", "public"] },
-  { "symbol": [ "QPropertyData", "private", "<QPropertyData>", "public"] },
-  { "symbol": [ "QPropertyNotifier", "private", "<QPropertyNotifier>", "public"] },
-  { "symbol": [ "QPropertyObserver", "private", "<QPropertyObserver>", "public"] },
-  { "symbol": [ "QPropertyObserverBase", "private", "<QPropertyObserverBase>", "public"] },
-  { "symbol": [ "QPropertyProxyBindingData", "private", "<QPropertyProxyBindingData>", "public"] },
-  { "symbol": [ "QProxyStyle", "private", "<QProxyStyle>", "public"] },
-  { "symbol": [ "QPushButton", "private", "<QPushButton>", "public"] },
-  { "symbol": [ "QQmlAbstractUrlInterceptor", "private", "<QQmlAbstractUrlInterceptor>", "public"] },
-  { "symbol": [ "QQmlApplicationEngine", "private", "<QQmlApplicationEngine>", "public"] },
-  { "symbol": [ "QQmlComponent", "private", "<QQmlComponent>", "public"] },
-  { "symbol": [ "QQmlContext", "private", "<QQmlContext>", "public"] },
-  { "symbol": [ "QQmlDebuggingEnabler", "private", "<QQmlDebuggingEnabler>", "public"] },
-  { "symbol": [ "QQmlEngine", "private", "<QQmlEngine>", "public"] },
-  { "symbol": [ "QQmlEngineExtensionInterface", "private", "<QQmlEngineExtensionInterface>", "public"] },
-  { "symbol": [ "QQmlEngineExtensionPlugin", "private", "<QQmlEngineExtensionPlugin>", "public"] },
-  { "symbol": [ "QQmlError", "private", "<QQmlError>", "public"] },
-  { "symbol": [ "QQmlExpression", "private", "<QQmlExpression>", "public"] },
-  { "symbol": [ "QQmlExtensionInterface", "private", "<QQmlExtensionInterface>", "public"] },
-  { "symbol": [ "QQmlExtensionPlugin", "private", "<QQmlExtensionPlugin>", "public"] },
-  { "symbol": [ "QQmlFile", "private", "<QQmlFile>", "public"] },
-  { "symbol": [ "QQmlFileSelector", "private", "<QQmlFileSelector>", "public"] },
-  { "symbol": [ "QQmlImageProviderBase", "private", "<QQmlImageProviderBase>", "public"] },
-  { "symbol": [ "QQmlIncubationController", "private", "<QQmlIncubationController>", "public"] },
-  { "symbol": [ "QQmlIncubator", "private", "<QQmlIncubator>", "public"] },
-  { "symbol": [ "QQmlInfo", "private", "<QQmlInfo>", "public"] },
-  { "symbol": [ "QQmlListProperty", "private", "<QQmlListProperty>", "public"] },
-  { "symbol": [ "QQmlListReference", "private", "<QQmlListReference>", "public"] },
-  { "symbol": [ "QQmlModuleRegistration", "private", "<QQmlModuleRegistration>", "public"] },
-  { "symbol": [ "QQmlNetworkAccessManagerFactory", "private", "<QQmlNetworkAccessManagerFactory>", "public"] },
-  { "symbol": [ "QQmlParserStatus", "private", "<QQmlParserStatus>", "public"] },
-  { "symbol": [ "QQmlProperties", "private", "<QQmlProperties>", "public"] },
-  { "symbol": [ "QQmlProperty", "private", "<QQmlProperty>", "public"] },
-  { "symbol": [ "QQmlPropertyMap", "private", "<QQmlPropertyMap>", "public"] },
-  { "symbol": [ "QQmlPropertyValueSource", "private", "<QQmlPropertyValueSource>", "public"] },
-  { "symbol": [ "QQmlScriptString", "private", "<QQmlScriptString>", "public"] },
-  { "symbol": [ "QQmlTypeInfo", "private", "<QQmlTypeInfo>", "public"] },
-  { "symbol": [ "QQmlTypeNotAvailable", "private", "<QQmlTypeNotAvailable>", "public"] },
-  { "symbol": [ "QQmlTypesExtensionInterface", "private", "<QQmlTypesExtensionInterface>", "public"] },
-  { "symbol": [ "QQmlWebChannel", "private", "<QQmlWebChannel>", "public"] },
-  { "symbol": [ "QQuaternion", "private", "<QQuaternion>", "public"] },
-  { "symbol": [ "QQueue", "private", "<QQueue>", "public"] },
-  { "symbol": [ "QQuick3D", "private", "<QQuick3D>", "public"] },
-  { "symbol": [ "QQuick3DGeometry", "private", "<QQuick3DGeometry>", "public"] },
-  { "symbol": [ "QQuick3DInstancing", "private", "<QQuick3DInstancing>", "public"] },
-  { "symbol": [ "QQuick3DObject", "private", "<QQuick3DObject>", "public"] },
-  { "symbol": [ "QQuick3DRenderExtension", "private", "<QQuick3DRenderExtension>", "public"] },
-  { "symbol": [ "QQuick3DTextureData", "private", "<QQuick3DTextureData>", "public"] },
-  { "symbol": [ "QQuick3DTextureProviderExtension", "private", "<QQuick3DTextureProviderExtension>", "public"] },
-  { "symbol": [ "QQuickAsyncImageProvider", "private", "<QQuickAsyncImageProvider>", "public"] },
-  { "symbol": [ "QQuickAttachedPropertyPropagator", "private", "<QQuickAttachedPropertyPropagator>", "public"] },
-  { "symbol": [ "QQuickFramebufferObject", "private", "<QQuickFramebufferObject>", "public"] },
-  { "symbol": [ "QQuickGraphicsConfiguration", "private", "<QQuickGraphicsConfiguration>", "public"] },
-  { "symbol": [ "QQuickGraphicsDevice", "private", "<QQuickGraphicsDevice>", "public"] },
-  { "symbol": [ "QQuickImageProvider", "private", "<QQuickImageProvider>", "public"] },
-  { "symbol": [ "QQuickImageResponse", "private", "<QQuickImageResponse>", "public"] },
-  { "symbol": [ "QQuickItem", "private", "<QQuickItem>", "public"] },
-  { "symbol": [ "QQuickItemGrabResult", "private", "<QQuickItemGrabResult>", "public"] },
-  { "symbol": [ "QQuickOpenGLUtils", "private", "<QQuickOpenGLUtils>", "public"] },
-  { "symbol": [ "QQuickPaintedItem", "private", "<QQuickPaintedItem>", "public"] },
-  { "symbol": [ "QQuickRenderControl", "private", "<QQuickRenderControl>", "public"] },
-  { "symbol": [ "QQuickRenderTarget", "private", "<QQuickRenderTarget>", "public"] },
-  { "symbol": [ "QQuickRhiItem", "private", "<QQuickRhiItem>", "public"] },
-  { "symbol": [ "QQuickRhiItemRenderer", "private", "<QQuickRhiItemRenderer>", "public"] },
-  { "symbol": [ "QQuickStyle", "private", "<QQuickStyle>", "public"] },
-  { "symbol": [ "QQuickTextDocument", "private", "<QQuickTextDocument>", "public"] },
-  { "symbol": [ "QQuickTextureFactory", "private", "<QQuickTextureFactory>", "public"] },
-  { "symbol": [ "QQuickTransform", "private", "<QQuickTransform>", "public"] },
-  { "symbol": [ "QQuickView", "private", "<QQuickView>", "public"] },
-  { "symbol": [ "QQuickWebEngineDownloadRequest", "private", "<QQuickWebEngineDownloadRequest>", "public"] },
-  { "symbol": [ "QQuickWebEngineProfile", "private", "<QQuickWebEngineProfile>", "public"] },
-  { "symbol": [ "QQuickWidget", "private", "<QQuickWidget>", "public"] },
-  { "symbol": [ "QQuickWindow", "private", "<QQuickWindow>", "public"] },
-  { "symbol": [ "QRadialGradient", "private", "<QRadialGradient>", "public"] },
-  { "symbol": [ "QRadioButton", "private", "<QRadioButton>", "public"] },
-  { "symbol": [ "QRandomGenerator", "private", "<QRandomGenerator>", "public"] },
-  { "symbol": [ "QRandomGenerator64", "private", "<QRandomGenerator64>", "public"] },
-  { "symbol": [ "QRangeModel", "private", "<QRangeModel>", "public"] },
-  { "symbol": [ "QRangeModelAdapter", "private", "<QRangeModelAdapter>", "public"] },
-  { "symbol": [ "QRasterWindow", "private", "<QRasterWindow>", "public"] },
-  { "symbol": [ "QRawFont", "private", "<QRawFont>", "public"] },
-  { "symbol": [ "QReadLocker", "private", "<QReadLocker>", "public"] },
-  { "symbol": [ "QReadWriteLock", "private", "<QReadWriteLock>", "public"] },
-  { "symbol": [ "QRect", "private", "<QRect>", "public"] },
-  { "symbol": [ "QRectF", "private", "<QRectF>", "public"] },
-  { "symbol": [ "QRecursiveMutex", "private", "<QRecursiveMutex>", "public"] },
-  { "symbol": [ "QRegExp", "private", "<QRegExp>", "public"] },
-  { "symbol": [ "QRegion", "private", "<QRegion>", "public"] },
-  { "symbol": [ "QRegularExpression", "private", "<QRegularExpression>", "public"] },
-  { "symbol": [ "QRegularExpressionMatch", "private", "<QRegularExpressionMatch>", "public"] },
-  { "symbol": [ "QRegularExpressionMatchIterator", "private", "<QRegularExpressionMatchIterator>", "public"] },
-  { "symbol": [ "QRegularExpressionValidator", "private", "<QRegularExpressionValidator>", "public"] },
-  { "symbol": [ "QResizeEvent", "private", "<QResizeEvent>", "public"] },
-  { "symbol": [ "QResource", "private", "<QResource>", "public"] },
-  { "symbol": [ "QRestAccessManager", "private", "<QRestAccessManager>", "public"] },
-  { "symbol": [ "QRestReply", "private", "<QRestReply>", "public"] },
-  { "symbol": [ "QReturnArgument", "private", "<QReturnArgument>", "public"] },
-  { "symbol": [ "QRgb", "private", "<QRgb>", "public"] },
-  { "symbol": [ "QRgba64", "private", "<QRgba64>", "public"] },
-  { "symbol": [ "QRgbaFloat", "private", "<QRgbaFloat>", "public"] },
-  { "symbol": [ "QRgbaFloat16", "private", "<QRgbaFloat16>", "public"] },
-  { "symbol": [ "QRgbaFloat32", "private", "<QRgbaFloat32>", "public"] },
-  { "symbol": [ "QRhiWidget", "private", "<QRhiWidget>", "public"] },
-  { "symbol": [ "QRubberBand", "private", "<QRubberBand>", "public"] },
-  { "symbol": [ "QRunnable", "private", "<QRunnable>", "public"] },
-  { "symbol": [ "QSGBasicGeometryNode", "private", "<QSGBasicGeometryNode>", "public"] },
-  { "symbol": [ "QSGClipNode", "private", "<QSGClipNode>", "public"] },
-  { "symbol": [ "QSGDynamicTexture", "private", "<QSGDynamicTexture>", "public"] },
-  { "symbol": [ "QSGFlatColorMaterial", "private", "<QSGFlatColorMaterial>", "public"] },
-  { "symbol": [ "QSGGeometry", "private", "<QSGGeometry>", "public"] },
-  { "symbol": [ "QSGGeometryNode", "private", "<QSGGeometryNode>", "public"] },
-  { "symbol": [ "QSGImageNode", "private", "<QSGImageNode>", "public"] },
-  { "symbol": [ "QSGMaterial", "private", "<QSGMaterial>", "public"] },
-  { "symbol": [ "QSGMaterialShader", "private", "<QSGMaterialShader>", "public"] },
-  { "symbol": [ "QSGNinePatchNode", "private", "<QSGNinePatchNode>", "public"] },
-  { "symbol": [ "QSGNode", "private", "<QSGNode>", "public"] },
-  { "symbol": [ "QSGNodeVisitor", "private", "<QSGNodeVisitor>", "public"] },
-  { "symbol": [ "QSGOpacityNode", "private", "<QSGOpacityNode>", "public"] },
-  { "symbol": [ "QSGOpaqueTextureMaterial", "private", "<QSGOpaqueTextureMaterial>", "public"] },
-  { "symbol": [ "QSGRectangleNode", "private", "<QSGRectangleNode>", "public"] },
-  { "symbol": [ "QSGRenderNode", "private", "<QSGRenderNode>", "public"] },
-  { "symbol": [ "QSGRendererInterface", "private", "<QSGRendererInterface>", "public"] },
-  { "symbol": [ "QSGRootNode", "private", "<QSGRootNode>", "public"] },
-  { "symbol": [ "QSGSimpleRectNode", "private", "<QSGSimpleRectNode>", "public"] },
-  { "symbol": [ "QSGSimpleTextureNode", "private", "<QSGSimpleTextureNode>", "public"] },
-  { "symbol": [ "QSGTextNode", "private", "<QSGTextNode>", "public"] },
-  { "symbol": [ "QSGTexture", "private", "<QSGTexture>", "public"] },
-  { "symbol": [ "QSGTextureMaterial", "private", "<QSGTextureMaterial>", "public"] },
-  { "symbol": [ "QSGTextureProvider", "private", "<QSGTextureProvider>", "public"] },
-  { "symbol": [ "QSGTransformNode", "private", "<QSGTransformNode>", "public"] },
-  { "symbol": [ "QSGVertexColorMaterial", "private", "<QSGVertexColorMaterial>", "public"] },
-  { "symbol": [ "QSaveFile", "private", "<QSaveFile>", "public"] },
-  { "symbol": [ "QScopeGuard", "private", "<QScopeGuard>", "public"] },
-  { "symbol": [ "QScopedArrayPointer", "private", "<QScopedArrayPointer>", "public"] },
-  { "symbol": [ "QScopedPointer", "private", "<QScopedPointer>", "public"] },
-  { "symbol": [ "QScopedPointerArrayDeleter", "private", "<QScopedPointerArrayDeleter>", "public"] },
-  { "symbol": [ "QScopedPointerDeleteLater", "private", "<QScopedPointerDeleteLater>", "public"] },
-  { "symbol": [ "QScopedPointerDeleter", "private", "<QScopedPointerDeleter>", "public"] },
-  { "symbol": [ "QScopedPointerObjectDeleteLater", "private", "<QScopedPointerObjectDeleteLater>", "public"] },
-  { "symbol": [ "QScopedPointerPodDeleter", "private", "<QScopedPointerPodDeleter>", "public"] },
-  { "symbol": [ "QScopedPropertyUpdateGroup", "private", "<QScopedPropertyUpdateGroup>", "public"] },
-  { "symbol": [ "QScopedValueRollback", "private", "<QScopedValueRollback>", "public"] },
-  { "symbol": [ "QScreen", "private", "<QScreen>", "public"] },
-  { "symbol": [ "QScreenCapture", "private", "<QScreenCapture>", "public"] },
-  { "symbol": [ "QScreenOrientationChangeEvent", "private", "<QScreenOrientationChangeEvent>", "public"] },
-  { "symbol": [ "QScrollArea", "private", "<QScrollArea>", "public"] },
-  { "symbol": [ "QScrollBar", "private", "<QScrollBar>", "public"] },
-  { "symbol": [ "QScrollEvent", "private", "<QScrollEvent>", "public"] },
-  { "symbol": [ "QScrollPrepareEvent", "private", "<QScrollPrepareEvent>", "public"] },
-  { "symbol": [ "QScroller", "private", "<QScroller>", "public"] },
-  { "symbol": [ "QScrollerProperties", "private", "<QScrollerProperties>", "public"] },
-  { "symbol": [ "QScxmlCompiler", "private", "<QScxmlCompiler>", "public"] },
-  { "symbol": [ "QScxmlCppDataModel", "private", "<QScxmlCppDataModel>", "public"] },
-  { "symbol": [ "QScxmlDataModel", "private", "<QScxmlDataModel>", "public"] },
-  { "symbol": [ "QScxmlDynamicScxmlServiceFactory", "private", "<QScxmlDynamicScxmlServiceFactory>", "public"] },
-  { "symbol": [ "QScxmlError", "private", "<QScxmlError>", "public"] },
-  { "symbol": [ "QScxmlEvent", "private", "<QScxmlEvent>", "public"] },
-  { "symbol": [ "QScxmlInvokableService", "private", "<QScxmlInvokableService>", "public"] },
-  { "symbol": [ "QScxmlInvokableServiceFactory", "private", "<QScxmlInvokableServiceFactory>", "public"] },
-  { "symbol": [ "QScxmlNullDataModel", "private", "<QScxmlNullDataModel>", "public"] },
-  { "symbol": [ "QScxmlStateMachine", "private", "<QScxmlStateMachine>", "public"] },
-  { "symbol": [ "QScxmlStaticScxmlServiceFactory", "private", "<QScxmlStaticScxmlServiceFactory>", "public"] },
-  { "symbol": [ "QScxmlTableData", "private", "<QScxmlTableData>", "public"] },
-  { "symbol": [ "QSemaphore", "private", "<QSemaphore>", "public"] },
-  { "symbol": [ "QSemaphoreReleaser", "private", "<QSemaphoreReleaser>", "public"] },
-  { "symbol": [ "QSequentialAnimationGroup", "private", "<QSequentialAnimationGroup>", "public"] },
-  { "symbol": [ "QSequentialConstIterator", "private", "<QSequentialConstIterator>", "public"] },
-  { "symbol": [ "QSequentialIterable", "private", "<QSequentialIterable>", "public"] },
-  { "symbol": [ "QSequentialIterator", "private", "<QSequentialIterator>", "public"] },
-  { "symbol": [ "QSessionManager", "private", "<QSessionManager>", "public"] },
-  { "symbol": [ "QSet", "private", "<QSet>", "public"] },
-  { "symbol": [ "QSetIterator", "private", "<QSetIterator>", "public"] },
-  { "symbol": [ "QSettings", "private", "<QSettings>", "public"] },
-  { "symbol": [ "QSharedData", "private", "<QSharedData>", "public"] },
-  { "symbol": [ "QSharedDataPointer", "private", "<QSharedDataPointer>", "public"] },
-  { "symbol": [ "QSharedDataPointerBase", "private", "<QSharedDataPointerBase>", "public"] },
-  { "symbol": [ "QSharedMemory", "private", "<QSharedMemory>", "public"] },
-  { "symbol": [ "QSharedPointer", "private", "<QSharedPointer>", "public"] },
-  { "symbol": [ "QShortcut", "private", "<QShortcut>", "public"] },
-  { "symbol": [ "QShortcutEvent", "private", "<QShortcutEvent>", "public"] },
-  { "symbol": [ "QShowEvent", "private", "<QShowEvent>", "public"] },
-  { "symbol": [ "QSignalBlocker", "private", "<QSignalBlocker>", "public"] },
-  { "symbol": [ "QSignalMapper", "private", "<QSignalMapper>", "public"] },
-  { "symbol": [ "QSignalSpy", "private", "<QSignalSpy>", "public"] },
-  { "symbol": [ "QSignalTransition", "private", "<QSignalTransition>", "public"] },
-  { "symbol": [ "QSinglePointEvent", "private", "<QSinglePointEvent>", "public"] },
-  { "symbol": [ "QSize", "private", "<QSize>", "public"] },
-  { "symbol": [ "QSizeF", "private", "<QSizeF>", "public"] },
-  { "symbol": [ "QSizeGrip", "private", "<QSizeGrip>", "public"] },
-  { "symbol": [ "QSizePolicy", "private", "<QSizePolicy>", "public"] },
-  { "symbol": [ "QSlider", "private", "<QSlider>", "public"] },
-  { "symbol": [ "QSocketDescriptor", "private", "<QSocketDescriptor>", "public"] },
-  { "symbol": [ "QSocketNotifier", "private", "<QSocketNotifier>", "public"] },
-  { "symbol": [ "QSortFilterProxyModel", "private", "<QSortFilterProxyModel>", "public"] },
-  { "symbol": [ "QSoundEffect", "private", "<QSoundEffect>", "public"] },
-  { "symbol": [ "QSpacerItem", "private", "<QSpacerItem>", "public"] },
-  { "symbol": [ "QSpan", "private", "<QSpan>", "public"] },
-  { "symbol": [ "QSpatialSound", "private", "<QSpatialSound>", "public"] },
-  { "symbol": [ "QSpecialInteger", "private", "<QSpecialInteger>", "public"] },
-  { "symbol": [ "QSpinBox", "private", "<QSpinBox>", "public"] },
-  { "symbol": [ "QSplashScreen", "private", "<QSplashScreen>", "public"] },
-  { "symbol": [ "QSplitter", "private", "<QSplitter>", "public"] },
-  { "symbol": [ "QSplitterHandle", "private", "<QSplitterHandle>", "public"] },
-  { "symbol": [ "QSpontaneKeyEvent", "private", "<QSpontaneKeyEvent>", "public"] },
-  { "symbol": [ "QSql", "private", "<QSql>", "public"] },
-  { "symbol": [ "QSqlDatabase", "private", "<QSqlDatabase>", "public"] },
-  { "symbol": [ "QSqlDatabaseDefaultConnectionName", "private", "<QSqlDatabaseDefaultConnectionName>", "public"] },
-  { "symbol": [ "QSqlDriver", "private", "<QSqlDriver>", "public"] },
-  { "symbol": [ "QSqlDriverCreator", "private", "<QSqlDriverCreator>", "public"] },
-  { "symbol": [ "QSqlDriverCreatorBase", "private", "<QSqlDriverCreatorBase>", "public"] },
-  { "symbol": [ "QSqlDriverPlugin", "private", "<QSqlDriverPlugin>", "public"] },
-  { "symbol": [ "QSqlError", "private", "<QSqlError>", "public"] },
-  { "symbol": [ "QSqlField", "private", "<QSqlField>", "public"] },
-  { "symbol": [ "QSqlIndex", "private", "<QSqlIndex>", "public"] },
-  { "symbol": [ "QSqlQuery", "private", "<QSqlQuery>", "public"] },
-  { "symbol": [ "QSqlQueryModel", "private", "<QSqlQueryModel>", "public"] },
-  { "symbol": [ "QSqlRecord", "private", "<QSqlRecord>", "public"] },
-  { "symbol": [ "QSqlRelation", "private", "<QSqlRelation>", "public"] },
-  { "symbol": [ "QSqlRelationalDelegate", "private", "<QSqlRelationalDelegate>", "public"] },
-  { "symbol": [ "QSqlRelationalTableModel", "private", "<QSqlRelationalTableModel>", "public"] },
-  { "symbol": [ "QSqlResult", "private", "<QSqlResult>", "public"] },
-  { "symbol": [ "QSqlTableModel", "private", "<QSqlTableModel>", "public"] },
-  { "symbol": [ "QSsl", "private", "<QSsl>", "public"] },
-  { "symbol": [ "QSslCertificate", "private", "<QSslCertificate>", "public"] },
-  { "symbol": [ "QSslCertificateExtension", "private", "<QSslCertificateExtension>", "public"] },
-  { "symbol": [ "QSslCipher", "private", "<QSslCipher>", "public"] },
-  { "symbol": [ "QSslConfiguration", "private", "<QSslConfiguration>", "public"] },
-  { "symbol": [ "QSslDiffieHellmanParameters", "private", "<QSslDiffieHellmanParameters>", "public"] },
-  { "symbol": [ "QSslEllipticCurve", "private", "<QSslEllipticCurve>", "public"] },
-  { "symbol": [ "QSslError", "private", "<QSslError>", "public"] },
-  { "symbol": [ "QSslKey", "private", "<QSslKey>", "public"] },
-  { "symbol": [ "QSslPreSharedKeyAuthenticator", "private", "<QSslPreSharedKeyAuthenticator>", "public"] },
-  { "symbol": [ "QSslServer", "private", "<QSslServer>", "public"] },
-  { "symbol": [ "QSslSocket", "private", "<QSslSocket>", "public"] },
-  { "symbol": [ "QStack", "private", "<QStack>", "public"] },
-  { "symbol": [ "QStackedLayout", "private", "<QStackedLayout>", "public"] },
-  { "symbol": [ "QStackedWidget", "private", "<QStackedWidget>", "public"] },
-  { "symbol": [ "QStandardItem", "private", "<QStandardItem>", "public"] },
-  { "symbol": [ "QStandardItemEditorCreator", "private", "<QStandardItemEditorCreator>", "public"] },
-  { "symbol": [ "QStandardItemModel", "private", "<QStandardItemModel>", "public"] },
-  { "symbol": [ "QStandardPaths", "private", "<QStandardPaths>", "public"] },
-  { "symbol": [ "QState", "private", "<QState>", "public"] },
-  { "symbol": [ "QStateMachine", "private", "<QStateMachine>", "public"] },
-  { "symbol": [ "QStaticByteArrayMatcher", "private", "<QStaticByteArrayMatcher>", "public"] },
-  { "symbol": [ "QStaticByteArrayMatcherBase", "private", "<QStaticByteArrayMatcherBase>", "public"] },
-  { "symbol": [ "QStaticLatin1StringMatcher", "private", "<QStaticLatin1StringMatcher>", "public"] },
-  { "symbol": [ "QStaticPlugin", "private", "<QStaticPlugin>", "public"] },
-  { "symbol": [ "QStaticText", "private", "<QStaticText>", "public"] },
-  { "symbol": [ "QStatusBar", "private", "<QStatusBar>", "public"] },
-  { "symbol": [ "QStatusTipEvent", "private", "<QStatusTipEvent>", "public"] },
-  { "symbol": [ "QStorageInfo", "private", "<QStorageInfo>", "public"] },
-  { "symbol": [ "QString", "private", "<QString>", "public"] },
-  { "symbol": [ "QStringAlgorithms", "private", "<QStringAlgorithms>", "public"] },
-  { "symbol": [ "QStringBuilder", "private", "<QStringBuilder>", "public"] },
-  { "symbol": [ "QStringConverter", "private", "<QStringConverter>", "public"] },
-  { "symbol": [ "QStringConverterBase", "private", "<QStringConverterBase>", "public"] },
-  { "symbol": [ "QStringDecoder", "private", "<QStringDecoder>", "public"] },
-  { "symbol": [ "QStringEncoder", "private", "<QStringEncoder>", "public"] },
-  { "symbol": [ "QStringList", "private", "<QStringList>", "public"] },
-  { "symbol": [ "QStringListModel", "private", "<QStringListModel>", "public"] },
-  { "symbol": [ "QStringLiteral", "private", "<QStringLiteral>", "public"] },
-  { "symbol": [ "QStringMatcher", "private", "<QStringMatcher>", "public"] },
-  { "symbol": [ "QStringRef", "private", "<QStringRef>", "public"] },
-  { "symbol": [ "QStringTokenizer", "private", "<QStringTokenizer>", "public"] },
-  { "symbol": [ "QStringTokenizerBase", "private", "<QStringTokenizerBase>", "public"] },
-  { "symbol": [ "QStringTokenizerBaseBase", "private", "<QStringTokenizerBaseBase>", "public"] },
-  { "symbol": [ "QStringView", "private", "<QStringView>", "public"] },
-  { "symbol": [ "QStyle", "private", "<QStyle>", "public"] },
-  { "symbol": [ "QStyleFactory", "private", "<QStyleFactory>", "public"] },
-  { "symbol": [ "QStyleHintReturn", "private", "<QStyleHintReturn>", "public"] },
-  { "symbol": [ "QStyleHintReturnMask", "private", "<QStyleHintReturnMask>", "public"] },
-  { "symbol": [ "QStyleHintReturnVariant", "private", "<QStyleHintReturnVariant>", "public"] },
-  { "symbol": [ "QStyleHints", "private", "<QStyleHints>", "public"] },
-  { "symbol": [ "QStyleOption", "private", "<QStyleOption>", "public"] },
-  { "symbol": [ "QStyleOptionButton", "private", "<QStyleOptionButton>", "public"] },
-  { "symbol": [ "QStyleOptionComboBox", "private", "<QStyleOptionComboBox>", "public"] },
-  { "symbol": [ "QStyleOptionComplex", "private", "<QStyleOptionComplex>", "public"] },
-  { "symbol": [ "QStyleOptionDockWidget", "private", "<QStyleOptionDockWidget>", "public"] },
-  { "symbol": [ "QStyleOptionFocusRect", "private", "<QStyleOptionFocusRect>", "public"] },
-  { "symbol": [ "QStyleOptionFrame", "private", "<QStyleOptionFrame>", "public"] },
-  { "symbol": [ "QStyleOptionGraphicsItem", "private", "<QStyleOptionGraphicsItem>", "public"] },
-  { "symbol": [ "QStyleOptionGroupBox", "private", "<QStyleOptionGroupBox>", "public"] },
-  { "symbol": [ "QStyleOptionHeader", "private", "<QStyleOptionHeader>", "public"] },
-  { "symbol": [ "QStyleOptionHeaderV2", "private", "<QStyleOptionHeaderV2>", "public"] },
-  { "symbol": [ "QStyleOptionMenuItem", "private", "<QStyleOptionMenuItem>", "public"] },
-  { "symbol": [ "QStyleOptionMenuItemV2", "private", "<QStyleOptionMenuItemV2>", "public"] },
-  { "symbol": [ "QStyleOptionProgressBar", "private", "<QStyleOptionProgressBar>", "public"] },
-  { "symbol": [ "QStyleOptionRubberBand", "private", "<QStyleOptionRubberBand>", "public"] },
-  { "symbol": [ "QStyleOptionSizeGrip", "private", "<QStyleOptionSizeGrip>", "public"] },
-  { "symbol": [ "QStyleOptionSlider", "private", "<QStyleOptionSlider>", "public"] },
-  { "symbol": [ "QStyleOptionSpinBox", "private", "<QStyleOptionSpinBox>", "public"] },
-  { "symbol": [ "QStyleOptionTab", "private", "<QStyleOptionTab>", "public"] },
-  { "symbol": [ "QStyleOptionTabBarBase", "private", "<QStyleOptionTabBarBase>", "public"] },
-  { "symbol": [ "QStyleOptionTabWidgetFrame", "private", "<QStyleOptionTabWidgetFrame>", "public"] },
-  { "symbol": [ "QStyleOptionTitleBar", "private", "<QStyleOptionTitleBar>", "public"] },
-  { "symbol": [ "QStyleOptionToolBar", "private", "<QStyleOptionToolBar>", "public"] },
-  { "symbol": [ "QStyleOptionToolBox", "private", "<QStyleOptionToolBox>", "public"] },
-  { "symbol": [ "QStyleOptionToolButton", "private", "<QStyleOptionToolButton>", "public"] },
-  { "symbol": [ "QStyleOptionViewItem", "private", "<QStyleOptionViewItem>", "public"] },
-  { "symbol": [ "QStylePainter", "private", "<QStylePainter>", "public"] },
-  { "symbol": [ "QStylePlugin", "private", "<QStylePlugin>", "public"] },
-  { "symbol": [ "QStyledItemDelegate", "private", "<QStyledItemDelegate>", "public"] },
-  { "symbol": [ "QSurface", "private", "<QSurface>", "public"] },
-  { "symbol": [ "QSurfaceFormat", "private", "<QSurfaceFormat>", "public"] },
-  { "symbol": [ "QSvgGenerator", "private", "<QSvgGenerator>", "public"] },
-  { "symbol": [ "QSvgRenderer", "private", "<QSvgRenderer>", "public"] },
-  { "symbol": [ "QSvgWidget", "private", "<QSvgWidget>", "public"] },
-  { "symbol": [ "QSwipeGesture", "private", "<QSwipeGesture>", "public"] },
-  { "symbol": [ "QSyntaxHighlighter", "private", "<QSyntaxHighlighter>", "public"] },
-  { "symbol": [ "QSysInfo", "private", "<QSysInfo>", "public"] },
-  { "symbol": [ "QSystemSemaphore", "private", "<QSystemSemaphore>", "public"] },
-  { "symbol": [ "QSystemTrayIcon", "private", "<QSystemTrayIcon>", "public"] },
-  { "symbol": [ "QTabBar", "private", "<QTabBar>", "public"] },
-  { "symbol": [ "QTabWidget", "private", "<QTabWidget>", "public"] },
-  { "symbol": [ "QTableView", "private", "<QTableView>", "public"] },
-  { "symbol": [ "QTableWidget", "private", "<QTableWidget>", "public"] },
-  { "symbol": [ "QTableWidgetItem", "private", "<QTableWidgetItem>", "public"] },
-  { "symbol": [ "QTableWidgetSelectionRange", "private", "<QTableWidgetSelectionRange>", "public"] },
-  { "symbol": [ "QTabletEvent", "private", "<QTabletEvent>", "public"] },
-  { "symbol": [ "QTaggedIterator", "private", "<QTaggedIterator>", "public"] },
-  { "symbol": [ "QTaggedPointer", "private", "<QTaggedPointer>", "public"] },
-  { "symbol": [ "QTapAndHoldGesture", "private", "<QTapAndHoldGesture>", "public"] },
-  { "symbol": [ "QTapGesture", "private", "<QTapGesture>", "public"] },
-  { "symbol": [ "QTcpServer", "private", "<QTcpServer>", "public"] },
-  { "symbol": [ "QTcpSocket", "private", "<QTcpSocket>", "public"] },
-  { "symbol": [ "QTemplatedMetaMethodReturnArgument", "private", "<QTemplatedMetaMethodReturnArgument>", "public"] },
-  { "symbol": [ "QTemporaryDir", "private", "<QTemporaryDir>", "public"] },
-  { "symbol": [ "QTemporaryFile", "private", "<QTemporaryFile>", "public"] },
-  { "symbol": [ "QTest", "private", "<QTest>", "public"] },
-  { "symbol": [ "QTestAccessibility", "private", "<QTestAccessibility>", "public"] },
-  { "symbol": [ "QTestData", "private", "<QTestData>", "public"] },
-  { "symbol": [ "QTestDelayEvent", "private", "<QTestDelayEvent>", "public"] },
-  { "symbol": [ "QTestEvent", "private", "<QTestEvent>", "public"] },
-  { "symbol": [ "QTestEventList", "private", "<QTestEventList>", "public"] },
-  { "symbol": [ "QTestEventLoop", "private", "<QTestEventLoop>", "public"] },
-  { "symbol": [ "QTestKeyClicksEvent", "private", "<QTestKeyClicksEvent>", "public"] },
-  { "symbol": [ "QTestKeyEvent", "private", "<QTestKeyEvent>", "public"] },
-  { "symbol": [ "QTestMouseEvent", "private", "<QTestMouseEvent>", "public"] },
-  { "symbol": [ "QTextBlock", "private", "<QTextBlock>", "public"] },
-  { "symbol": [ "QTextBlockFormat", "private", "<QTextBlockFormat>", "public"] },
-  { "symbol": [ "QTextBlockGroup", "private", "<QTextBlockGroup>", "public"] },
-  { "symbol": [ "QTextBlockUserData", "private", "<QTextBlockUserData>", "public"] },
-  { "symbol": [ "QTextBoundaryFinder", "private", "<QTextBoundaryFinder>", "public"] },
-  { "symbol": [ "QTextBrowser", "private", "<QTextBrowser>", "public"] },
-  { "symbol": [ "QTextCharFormat", "private", "<QTextCharFormat>", "public"] },
-  { "symbol": [ "QTextCodec", "private", "<QTextCodec>", "public"] },
-  { "symbol": [ "QTextCursor", "private", "<QTextCursor>", "public"] },
-  { "symbol": [ "QTextDecoder", "private", "<QTextDecoder>", "public"] },
-  { "symbol": [ "QTextDocument", "private", "<QTextDocument>", "public"] },
-  { "symbol": [ "QTextDocumentFragment", "private", "<QTextDocumentFragment>", "public"] },
-  { "symbol": [ "QTextDocumentWriter", "private", "<QTextDocumentWriter>", "public"] },
-  { "symbol": [ "QTextEdit", "private", "<QTextEdit>", "public"] },
-  { "symbol": [ "QTextEncoder", "private", "<QTextEncoder>", "public"] },
-  { "symbol": [ "QTextFormat", "private", "<QTextFormat>", "public"] },
-  { "symbol": [ "QTextFragment", "private", "<QTextFragment>", "public"] },
-  { "symbol": [ "QTextFrame", "private", "<QTextFrame>", "public"] },
-  { "symbol": [ "QTextFrameFormat", "private", "<QTextFrameFormat>", "public"] },
-  { "symbol": [ "QTextFrameLayoutData", "private", "<QTextFrameLayoutData>", "public"] },
-  { "symbol": [ "QTextImageFormat", "private", "<QTextImageFormat>", "public"] },
-  { "symbol": [ "QTextInlineObject", "private", "<QTextInlineObject>", "public"] },
-  { "symbol": [ "QTextItem", "private", "<QTextItem>", "public"] },
-  { "symbol": [ "QTextLayout", "private", "<QTextLayout>", "public"] },
-  { "symbol": [ "QTextLength", "private", "<QTextLength>", "public"] },
-  { "symbol": [ "QTextLine", "private", "<QTextLine>", "public"] },
-  { "symbol": [ "QTextList", "private", "<QTextList>", "public"] },
-  { "symbol": [ "QTextListFormat", "private", "<QTextListFormat>", "public"] },
-  { "symbol": [ "QTextObject", "private", "<QTextObject>", "public"] },
-  { "symbol": [ "QTextObjectInterface", "private", "<QTextObjectInterface>", "public"] },
-  { "symbol": [ "QTextOption", "private", "<QTextOption>", "public"] },
-  { "symbol": [ "QTextStream", "private", "<QTextStream>", "public"] },
-  { "symbol": [ "QTextStreamFunction", "private", "<QTextStreamFunction>", "public"] },
-  { "symbol": [ "QTextStreamManipulator", "private", "<QTextStreamManipulator>", "public"] },
-  { "symbol": [ "QTextTable", "private", "<QTextTable>", "public"] },
-  { "symbol": [ "QTextTableCell", "private", "<QTextTableCell>", "public"] },
-  { "symbol": [ "QTextTableCellFormat", "private", "<QTextTableCellFormat>", "public"] },
-  { "symbol": [ "QTextTableFormat", "private", "<QTextTableFormat>", "public"] },
-  { "symbol": [ "QThread", "private", "<QThread>", "public"] },
-  { "symbol": [ "QThreadPool", "private", "<QThreadPool>", "public"] },
-  { "symbol": [ "QThreadStorage", "private", "<QThreadStorage>", "public"] },
-  { "symbol": [ "QThreadStorageData", "private", "<QThreadStorageData>", "public"] },
-  { "symbol": [ "QThreadStorageTraits", "private", "<QThreadStorageTraits>", "public"] },
-  { "symbol": [ "QTileRules", "private", "<QTileRules>", "public"] },
-  { "symbol": [ "QTime", "private", "<QTime>", "public"] },
-  { "symbol": [ "QTimeEdit", "private", "<QTimeEdit>", "public"] },
-  { "symbol": [ "QTimeLine", "private", "<QTimeLine>", "public"] },
-  { "symbol": [ "QTimeZone", "private", "<QTimeZone>", "public"] },
-  { "symbol": [ "QTimer", "private", "<QTimer>", "public"] },
-  { "symbol": [ "QTimerEvent", "private", "<QTimerEvent>", "public"] },
-  { "symbol": [ "QToolBar", "private", "<QToolBar>", "public"] },
-  { "symbol": [ "QToolBarChangeEvent", "private", "<QToolBarChangeEvent>", "public"] },
-  { "symbol": [ "QToolBox", "private", "<QToolBox>", "public"] },
-  { "symbol": [ "QToolButton", "private", "<QToolButton>", "public"] },
-  { "symbol": [ "QToolTip", "private", "<QToolTip>", "public"] },
-  { "symbol": [ "QTouchEvent", "private", "<QTouchEvent>", "public"] },
-  { "symbol": [ "QTransform", "private", "<QTransform>", "public"] },
-  { "symbol": [ "QTranslator", "private", "<QTranslator>", "public"] },
-  { "symbol": [ "QTransposeProxyModel", "private", "<QTransposeProxyModel>", "public"] },
-  { "symbol": [ "QTreeView", "private", "<QTreeView>", "public"] },
-  { "symbol": [ "QTreeWidget", "private", "<QTreeWidget>", "public"] },
-  { "symbol": [ "QTreeWidgetItem", "private", "<QTreeWidgetItem>", "public"] },
-  { "symbol": [ "QTreeWidgetItemIterator", "private", "<QTreeWidgetItemIterator>", "public"] },
-  { "symbol": [ "QTypeInfo", "private", "<QTypeInfo>", "public"] },
-  { "symbol": [ "QTypeInfoMerger", "private", "<QTypeInfoMerger>", "public"] },
-  { "symbol": [ "QTypeRevision", "private", "<QTypeRevision>", "public"] },
-  { "symbol": [ "QTypedArrayAllocationResult", "private", "<QTypedArrayAllocationResult>", "public"] },
-  { "symbol": [ "QTypedArrayData", "private", "<QTypedArrayData>", "public"] },
-  { "symbol": [ "QUdpSocket", "private", "<QUdpSocket>", "public"] },
-  { "symbol": [ "QUiLoader", "private", "<QUiLoader>", "public"] },
-  { "symbol": [ "QUndoCommand", "private", "<QUndoCommand>", "public"] },
-  { "symbol": [ "QUndoGroup", "private", "<QUndoGroup>", "public"] },
-  { "symbol": [ "QUndoStack", "private", "<QUndoStack>", "public"] },
-  { "symbol": [ "QUndoView", "private", "<QUndoView>", "public"] },
-  { "symbol": [ "QUnhandledException", "private", "<QUnhandledException>", "public"] },
-  { "symbol": [ "QUntypedBindable", "private", "<QUntypedBindable>", "public"] },
-  { "symbol": [ "QUntypedPropertyBinding", "private", "<QUntypedPropertyBinding>", "public"] },
-  { "symbol": [ "QUntypedPropertyData", "private", "<QUntypedPropertyData>", "public"] },
-  { "symbol": [ "QUrl", "private", "<QUrl>", "public"] },
-  { "symbol": [ "QUrlQuery", "private", "<QUrlQuery>", "public"] },
-  { "symbol": [ "QUrlTwoFlags", "private", "<QUrlTwoFlags>", "public"] },
-  { "symbol": [ "QUtf8StringView", "private", "<QUtf8StringView>", "public"] },
-  { "symbol": [ "QUuid", "private", "<QUuid>", "public"] },
-  { "symbol": [ "QVBoxLayout", "private", "<QVBoxLayout>", "public"] },
-  { "symbol": [ "QValidator", "private", "<QValidator>", "public"] },
-  { "symbol": [ "QVarLengthArray", "private", "<QVarLengthArray>", "public"] },
-  { "symbol": [ "QVariant", "private", "<QVariant>", "public"] },
-  { "symbol": [ "QVariantAnimation", "private", "<QVariantAnimation>", "public"] },
-  { "symbol": [ "QVariantHash", "private", "<QVariantHash>", "public"] },
-  { "symbol": [ "QVariantList", "private", "<QVariantList>", "public"] },
-  { "symbol": [ "QVariantMap", "private", "<QVariantMap>", "public"] },
-  { "symbol": [ "QVector", "private", "<QVector>", "public"] },
-  { "symbol": [ "QVector2D", "private", "<QVector2D>", "public"] },
-  { "symbol": [ "QVector3D", "private", "<QVector3D>", "public"] },
-  { "symbol": [ "QVector4D", "private", "<QVector4D>", "public"] },
-  { "symbol": [ "QVectorIterator", "private", "<QVectorIterator>", "public"] },
-  { "symbol": [ "QVersionNumber", "private", "<QVersionNumber>", "public"] },
-  { "symbol": [ "QVideoFrame", "private", "<QVideoFrame>", "public"] },
-  { "symbol": [ "QVideoFrameFormat", "private", "<QVideoFrameFormat>", "public"] },
-  { "symbol": [ "QVideoFrameInput", "private", "<QVideoFrameInput>", "public"] },
-  { "symbol": [ "QVideoSink", "private", "<QVideoSink>", "public"] },
-  { "symbol": [ "QVideoWidget", "private", "<QVideoWidget>", "public"] },
-  { "symbol": [ "QVulkanDeviceFunctions", "private", "<QVulkanDeviceFunctions>", "public"] },
-  { "symbol": [ "QVulkanExtension", "private", "<QVulkanExtension>", "public"] },
-  { "symbol": [ "QVulkanFunctions", "private", "<QVulkanFunctions>", "public"] },
-  { "symbol": [ "QVulkanInfoVector", "private", "<QVulkanInfoVector>", "public"] },
-  { "symbol": [ "QVulkanInstance", "private", "<QVulkanInstance>", "public"] },
-  { "symbol": [ "QVulkanLayer", "private", "<QVulkanLayer>", "public"] },
-  { "symbol": [ "QVulkanWindow", "private", "<QVulkanWindow>", "public"] },
-  { "symbol": [ "QVulkanWindowRenderer", "private", "<QVulkanWindowRenderer>", "public"] },
-  { "symbol": [ "QWaitCondition", "private", "<QWaitCondition>", "public"] },
-  { "symbol": [ "QWaveDecoder", "private", "<QWaveDecoder>", "public"] },
-  { "symbol": [ "QWaylandBufferRef", "private", "<QWaylandBufferRef>", "public"] },
-  { "symbol": [ "QWaylandClient", "private", "<QWaylandClient>", "public"] },
-  { "symbol": [ "QWaylandClientExtension", "private", "<QWaylandClientExtension>", "public"] },
-  { "symbol": [ "QWaylandClientExtensionTemplate", "private", "<QWaylandClientExtensionTemplate>", "public"] },
-  { "symbol": [ "QWaylandCompositor", "private", "<QWaylandCompositor>", "public"] },
-  { "symbol": [ "QWaylandCompositorExtension", "private", "<QWaylandCompositorExtension>", "public"] },
-  { "symbol": [ "QWaylandCompositorExtensionTemplate", "private", "<QWaylandCompositorExtensionTemplate>", "public"] },
-  { "symbol": [ "QWaylandDestroyListener", "private", "<QWaylandDestroyListener>", "public"] },
-  { "symbol": [ "QWaylandDrag", "private", "<QWaylandDrag>", "public"] },
-  { "symbol": [ "QWaylandIdleInhibitManagerV1", "private", "<QWaylandIdleInhibitManagerV1>", "public"] },
-  { "symbol": [ "QWaylandInputMethodControl", "private", "<QWaylandInputMethodControl>", "public"] },
-  { "symbol": [ "QWaylandIviApplication", "private", "<QWaylandIviApplication>", "public"] },
-  { "symbol": [ "QWaylandIviSurface", "private", "<QWaylandIviSurface>", "public"] },
-  { "symbol": [ "QWaylandKeyboard", "private", "<QWaylandKeyboard>", "public"] },
-  { "symbol": [ "QWaylandKeymap", "private", "<QWaylandKeymap>", "public"] },
-  { "symbol": [ "QWaylandObject", "private", "<QWaylandObject>", "public"] },
-  { "symbol": [ "QWaylandOutput", "private", "<QWaylandOutput>", "public"] },
-  { "symbol": [ "QWaylandOutputMode", "private", "<QWaylandOutputMode>", "public"] },
-  { "symbol": [ "QWaylandPointer", "private", "<QWaylandPointer>", "public"] },
-  { "symbol": [ "QWaylandQtTextInputMethod", "private", "<QWaylandQtTextInputMethod>", "public"] },
-  { "symbol": [ "QWaylandQtTextInputMethodManager", "private", "<QWaylandQtTextInputMethodManager>", "public"] },
-  { "symbol": [ "QWaylandQtWindowManager", "private", "<QWaylandQtWindowManager>", "public"] },
-  { "symbol": [ "QWaylandQuickCompositor", "private", "<QWaylandQuickCompositor>", "public"] },
-  { "symbol": [ "QWaylandQuickExtension", "private", "<QWaylandQuickExtension>", "public"] },
-  { "symbol": [ "QWaylandQuickItem", "private", "<QWaylandQuickItem>", "public"] },
-  { "symbol": [ "QWaylandQuickOutput", "private", "<QWaylandQuickOutput>", "public"] },
-  { "symbol": [ "QWaylandQuickShellIntegration", "private", "<QWaylandQuickShellIntegration>", "public"] },
-  { "symbol": [ "QWaylandQuickShellSurfaceItem", "private", "<QWaylandQuickShellSurfaceItem>", "public"] },
-  { "symbol": [ "QWaylandQuickSurface", "private", "<QWaylandQuickSurface>", "public"] },
-  { "symbol": [ "QWaylandQuickXdgOutputV1", "private", "<QWaylandQuickXdgOutputV1>", "public"] },
-  { "symbol": [ "QWaylandResource", "private", "<QWaylandResource>", "public"] },
-  { "symbol": [ "QWaylandSeat", "private", "<QWaylandSeat>", "public"] },
-  { "symbol": [ "QWaylandShell", "private", "<QWaylandShell>", "public"] },
-  { "symbol": [ "QWaylandShellSurface", "private", "<QWaylandShellSurface>", "public"] },
-  { "symbol": [ "QWaylandShellSurfaceTemplate", "private", "<QWaylandShellSurfaceTemplate>", "public"] },
-  { "symbol": [ "QWaylandShellTemplate", "private", "<QWaylandShellTemplate>", "public"] },
-  { "symbol": [ "QWaylandSurface", "private", "<QWaylandSurface>", "public"] },
-  { "symbol": [ "QWaylandSurfaceGrabber", "private", "<QWaylandSurfaceGrabber>", "public"] },
-  { "symbol": [ "QWaylandSurfaceRole", "private", "<QWaylandSurfaceRole>", "public"] },
-  { "symbol": [ "QWaylandTextInput", "private", "<QWaylandTextInput>", "public"] },
-  { "symbol": [ "QWaylandTextInputManager", "private", "<QWaylandTextInputManager>", "public"] },
-  { "symbol": [ "QWaylandTextInputManagerV3", "private", "<QWaylandTextInputManagerV3>", "public"] },
-  { "symbol": [ "QWaylandTextInputV3", "private", "<QWaylandTextInputV3>", "public"] },
-  { "symbol": [ "QWaylandTouch", "private", "<QWaylandTouch>", "public"] },
-  { "symbol": [ "QWaylandView", "private", "<QWaylandView>", "public"] },
-  { "symbol": [ "QWaylandViewporter", "private", "<QWaylandViewporter>", "public"] },
-  { "symbol": [ "QWaylandWlShell", "private", "<QWaylandWlShell>", "public"] },
-  { "symbol": [ "QWaylandWlShellSurface", "private", "<QWaylandWlShellSurface>", "public"] },
-  { "symbol": [ "QWaylandXdgDecorationManagerV1", "private", "<QWaylandXdgDecorationManagerV1>", "public"] },
-  { "symbol": [ "QWaylandXdgOutputManagerV1", "private", "<QWaylandXdgOutputManagerV1>", "public"] },
-  { "symbol": [ "QWaylandXdgOutputV1", "private", "<QWaylandXdgOutputV1>", "public"] },
-  { "symbol": [ "QWaylandXdgPopup", "private", "<QWaylandXdgPopup>", "public"] },
-  { "symbol": [ "QWaylandXdgShell", "private", "<QWaylandXdgShell>", "public"] },
-  { "symbol": [ "QWaylandXdgSurface", "private", "<QWaylandXdgSurface>", "public"] },
-  { "symbol": [ "QWaylandXdgToplevel", "private", "<QWaylandXdgToplevel>", "public"] },
-  { "symbol": [ "QWeakPointer", "private", "<QWeakPointer>", "public"] },
-  { "symbol": [ "QWebChannel", "private", "<QWebChannel>", "public"] },
-  { "symbol": [ "QWebChannelAbstractTransport", "private", "<QWebChannelAbstractTransport>", "public"] },
-  { "symbol": [ "QWebEngineCertificateError", "private", "<QWebEngineCertificateError>", "public"] },
-  { "symbol": [ "QWebEngineClientCertificateSelection", "private", "<QWebEngineClientCertificateSelection>", "public"] },
-  { "symbol": [ "QWebEngineClientCertificateStore", "private", "<QWebEngineClientCertificateStore>", "public"] },
-  { "symbol": [ "QWebEngineClientHints", "private", "<QWebEngineClientHints>", "public"] },
-  { "symbol": [ "QWebEngineContextMenuRequest", "private", "<QWebEngineContextMenuRequest>", "public"] },
-  { "symbol": [ "QWebEngineCookieStore", "private", "<QWebEngineCookieStore>", "public"] },
-  { "symbol": [ "QWebEngineDesktopMediaRequest", "private", "<QWebEngineDesktopMediaRequest>", "public"] },
-  { "symbol": [ "QWebEngineDownloadRequest", "private", "<QWebEngineDownloadRequest>", "public"] },
-  { "symbol": [ "QWebEngineExtensionInfo", "private", "<QWebEngineExtensionInfo>", "public"] },
-  { "symbol": [ "QWebEngineExtensionManager", "private", "<QWebEngineExtensionManager>", "public"] },
-  { "symbol": [ "QWebEngineFileSystemAccessRequest", "private", "<QWebEngineFileSystemAccessRequest>", "public"] },
-  { "symbol": [ "QWebEngineFindTextResult", "private", "<QWebEngineFindTextResult>", "public"] },
-  { "symbol": [ "QWebEngineFrame", "private", "<QWebEngineFrame>", "public"] },
-  { "symbol": [ "QWebEngineFullScreenRequest", "private", "<QWebEngineFullScreenRequest>", "public"] },
-  { "symbol": [ "QWebEngineGlobalSettings", "private", "<QWebEngineGlobalSettings>", "public"] },
-  { "symbol": [ "QWebEngineHistory", "private", "<QWebEngineHistory>", "public"] },
-  { "symbol": [ "QWebEngineHistoryItem", "private", "<QWebEngineHistoryItem>", "public"] },
-  { "symbol": [ "QWebEngineHistoryModel", "private", "<QWebEngineHistoryModel>", "public"] },
-  { "symbol": [ "QWebEngineHttpRequest", "private", "<QWebEngineHttpRequest>", "public"] },
-  { "symbol": [ "QWebEngineLoadingInfo", "private", "<QWebEngineLoadingInfo>", "public"] },
-  { "symbol": [ "QWebEngineNavigationRequest", "private", "<QWebEngineNavigationRequest>", "public"] },
-  { "symbol": [ "QWebEngineNewWindowRequest", "private", "<QWebEngineNewWindowRequest>", "public"] },
-  { "symbol": [ "QWebEngineNotification", "private", "<QWebEngineNotification>", "public"] },
-  { "symbol": [ "QWebEnginePage", "private", "<QWebEnginePage>", "public"] },
-  { "symbol": [ "QWebEnginePermission", "private", "<QWebEnginePermission>", "public"] },
-  { "symbol": [ "QWebEngineProfile", "private", "<QWebEngineProfile>", "public"] },
-  { "symbol": [ "QWebEngineProfileBuilder", "private", "<QWebEngineProfileBuilder>", "public"] },
-  { "symbol": [ "QWebEngineQuotaRequest", "private", "<QWebEngineQuotaRequest>", "public"] },
-  { "symbol": [ "QWebEngineRegisterProtocolHandlerRequest", "private", "<QWebEngineRegisterProtocolHandlerRequest>", "public"] },
-  { "symbol": [ "QWebEngineScript", "private", "<QWebEngineScript>", "public"] },
-  { "symbol": [ "QWebEngineScriptCollection", "private", "<QWebEngineScriptCollection>", "public"] },
-  { "symbol": [ "QWebEngineSettings", "private", "<QWebEngineSettings>", "public"] },
-  { "symbol": [ "QWebEngineUrlRequestInfo", "private", "<QWebEngineUrlRequestInfo>", "public"] },
-  { "symbol": [ "QWebEngineUrlRequestInterceptor", "private", "<QWebEngineUrlRequestInterceptor>", "public"] },
-  { "symbol": [ "QWebEngineUrlRequestJob", "private", "<QWebEngineUrlRequestJob>", "public"] },
-  { "symbol": [ "QWebEngineUrlScheme", "private", "<QWebEngineUrlScheme>", "public"] },
-  { "symbol": [ "QWebEngineUrlSchemeHandler", "private", "<QWebEngineUrlSchemeHandler>", "public"] },
-  { "symbol": [ "QWebEngineView", "private", "<QWebEngineView>", "public"] },
-  { "symbol": [ "QWebEngineWebAuthPinRequest", "private", "<QWebEngineWebAuthPinRequest>", "public"] },
-  { "symbol": [ "QWebEngineWebAuthUxRequest", "private", "<QWebEngineWebAuthUxRequest>", "public"] },
-  { "symbol": [ "QWebSocket", "private", "<QWebSocket>", "public"] },
-  { "symbol": [ "QWebSocketCorsAuthenticator", "private", "<QWebSocketCorsAuthenticator>", "public"] },
-  { "symbol": [ "QWebSocketHandshakeOptions", "private", "<QWebSocketHandshakeOptions>", "public"] },
-  { "symbol": [ "QWebSocketProtocol", "private", "<QWebSocketProtocol>", "public"] },
-  { "symbol": [ "QWebSocketServer", "private", "<QWebSocketServer>", "public"] },
-  { "symbol": [ "QWhatsThis", "private", "<QWhatsThis>", "public"] },
-  { "symbol": [ "QWhatsThisClickedEvent", "private", "<QWhatsThisClickedEvent>", "public"] },
-  { "symbol": [ "QWheelEvent", "private", "<QWheelEvent>", "public"] },
-  { "symbol": [ "QWidget", "private", "<QWidget>", "public"] },
-  { "symbol": [ "QWidgetAction", "private", "<QWidgetAction>", "public"] },
-  { "symbol": [ "QWidgetData", "private", "<QWidgetData>", "public"] },
-  { "symbol": [ "QWidgetItem", "private", "<QWidgetItem>", "public"] },
-  { "symbol": [ "QWidgetItemV2", "private", "<QWidgetItemV2>", "public"] },
-  { "symbol": [ "QWidgetList", "private", "<QWidgetList>", "public"] },
-  { "symbol": [ "QWidgetMapper", "private", "<QWidgetMapper>", "public"] },
-  { "symbol": [ "QWidgetSet", "private", "<QWidgetSet>", "public"] },
-  { "symbol": [ "QWinEventNotifier", "private", "<QWinEventNotifier>", "public"] },
-  { "symbol": [ "QWindow", "private", "<QWindow>", "public"] },
-  { "symbol": [ "QWindowCapture", "private", "<QWindowCapture>", "public"] },
-  { "symbol": [ "QWindowList", "private", "<QWindowList>", "public"] },
-  { "symbol": [ "QWindowStateChangeEvent", "private", "<QWindowStateChangeEvent>", "public"] },
-  { "symbol": [ "QWizard", "private", "<QWizard>", "public"] },
-  { "symbol": [ "QWizardPage", "private", "<QWizardPage>", "public"] },
-  { "symbol": [ "QWriteLocker", "private", "<QWriteLocker>", "public"] },
-  { "symbol": [ "QXmlAttributes", "private", "<QXmlAttributes>", "public"] },
-  { "symbol": [ "QXmlContentHandler", "private", "<QXmlContentHandler>", "public"] },
-  { "symbol": [ "QXmlDTDHandler", "private", "<QXmlDTDHandler>", "public"] },
-  { "symbol": [ "QXmlDeclHandler", "private", "<QXmlDeclHandler>", "public"] },
-  { "symbol": [ "QXmlDefaultHandler", "private", "<QXmlDefaultHandler>", "public"] },
-  { "symbol": [ "QXmlEntityResolver", "private", "<QXmlEntityResolver>", "public"] },
-  { "symbol": [ "QXmlErrorHandler", "private", "<QXmlErrorHandler>", "public"] },
-  { "symbol": [ "QXmlInputSource", "private", "<QXmlInputSource>", "public"] },
-  { "symbol": [ "QXmlLexicalHandler", "private", "<QXmlLexicalHandler>", "public"] },
-  { "symbol": [ "QXmlLocator", "private", "<QXmlLocator>", "public"] },
-  { "symbol": [ "QXmlNamespaceSupport", "private", "<QXmlNamespaceSupport>", "public"] },
-  { "symbol": [ "QXmlParseException", "private", "<QXmlParseException>", "public"] },
-  { "symbol": [ "QXmlReader", "private", "<QXmlReader>", "public"] },
-  { "symbol": [ "QXmlSimpleReader", "private", "<QXmlSimpleReader>", "public"] },
-  { "symbol": [ "QXmlStreamAttribute", "private", "<QXmlStreamAttribute>", "public"] },
-  { "symbol": [ "QXmlStreamAttributes", "private", "<QXmlStreamAttributes>", "public"] },
-  { "symbol": [ "QXmlStreamEntityDeclaration", "private", "<QXmlStreamEntityDeclaration>", "public"] },
-  { "symbol": [ "QXmlStreamEntityDeclarations", "private", "<QXmlStreamEntityDeclarations>", "public"] },
-  { "symbol": [ "QXmlStreamEntityResolver", "private", "<QXmlStreamEntityResolver>", "public"] },
-  { "symbol": [ "QXmlStreamNamespaceDeclaration", "private", "<QXmlStreamNamespaceDeclaration>", "public"] },
-  { "symbol": [ "QXmlStreamNamespaceDeclarations", "private", "<QXmlStreamNamespaceDeclarations>", "public"] },
-  { "symbol": [ "QXmlStreamNotationDeclaration", "private", "<QXmlStreamNotationDeclaration>", "public"] },
-  { "symbol": [ "QXmlStreamNotationDeclarations", "private", "<QXmlStreamNotationDeclarations>", "public"] },
-  { "symbol": [ "QXmlStreamReader", "private", "<QXmlStreamReader>", "public"] },
-  { "symbol": [ "QXmlStreamWriter", "private", "<QXmlStreamWriter>", "public"] },
-  { "symbol": [ "Q_IPV6ADDR", "private", "<Q_IPV6ADDR>", "public"] },
-  { "symbol": [ "Qt", "private", "<Qt>", "public"] },
-  { "symbol": [ "QtAlgorithms", "private", "<QtAlgorithms>", "public"] },
-  { "symbol": [ "QtAudio", "private", "<QtAudio>", "public"] },
-  { "symbol": [ "QtBluetoothVersion", "private", "<QtBluetoothVersion>", "public"] },
-  { "symbol": [ "QtCborCommon", "private", "<QtCborCommon>", "public"] },
-  { "symbol": [ "QtCleanUpFunction", "private", "<QtCleanUpFunction>", "public"] },
-  { "symbol": [ "QtCompare", "private", "<QtCompare>", "public"] },
-  { "symbol": [ "QtCompilerDetection", "private", "<QtCompilerDetection>", "public"] },
-  { "symbol": [ "QtConcurrentFilter", "private", "<QtConcurrentFilter>", "public"] },
-  { "symbol": [ "QtConcurrentMap", "private", "<QtConcurrentMap>", "public"] },
-  { "symbol": [ "QtConcurrentRun", "private", "<QtConcurrentRun>", "public"] },
-  { "symbol": [ "QtConcurrentTask", "private", "<QtConcurrentTask>", "public"] },
-  { "symbol": [ "QtConcurrentVersion", "private", "<QtConcurrentVersion>", "public"] },
-  { "symbol": [ "QtConfig", "private", "<QtConfig>", "public"] },
-  { "symbol": [ "QtConnectivityVersion", "private", "<QtConnectivityVersion>", "public"] },
-  { "symbol": [ "QtConstructorMacros", "private", "<QtConstructorMacros>", "public"] },
-  { "symbol": [ "QtContainerFwd", "private", "<QtContainerFwd>", "public"] },
-  { "symbol": [ "QtCore5CompatVersion", "private", "<QtCore5CompatVersion>", "public"] },
-  { "symbol": [ "QtCoreGlobal", "private", "<QtCoreGlobal>", "public"] },
-  { "symbol": [ "QtCoreVersion", "private", "<QtCoreVersion>", "public"] },
-  { "symbol": [ "QtCoverageScanner", "private", "<QtCoverageScanner>", "public"] },
-  { "symbol": [ "QtDBusVersion", "private", "<QtDBusVersion>", "public"] },
-  { "symbol": [ "QtDarwinHelpers", "private", "<QtDarwinHelpers>", "public"] },
-  { "symbol": [ "QtDebug", "private", "<QtDebug>", "public"] },
-  { "symbol": [ "QtDeprecationMarkers", "private", "<QtDeprecationMarkers>", "public"] },
-  { "symbol": [ "QtDeviceDiscoverySupportVersion", "private", "<QtDeviceDiscoverySupportVersion>", "public"] },
-  { "symbol": [ "QtEndian", "private", "<QtEndian>", "public"] },
-  { "symbol": [ "QtEvents", "private", "<QtEvents>", "public"] },
-  { "symbol": [ "QtExceptionHandling", "private", "<QtExceptionHandling>", "public"] },
-  { "symbol": [ "QtFFmpegMediaPluginImplVersion", "private", "<QtFFmpegMediaPluginImplVersion>", "public"] },
-  { "symbol": [ "QtFbSupportVersion", "private", "<QtFbSupportVersion>", "public"] },
-  { "symbol": [ "QtGlobal", "private", "<QtGlobal>", "public"] },
-  { "symbol": [ "QtGuiVersion", "private", "<QtGuiVersion>", "public"] },
-  { "symbol": [ "QtHelpVersion", "private", "<QtHelpVersion>", "public"] },
-  { "symbol": [ "QtInputSupportVersion", "private", "<QtInputSupportVersion>", "public"] },
-  { "symbol": [ "QtKmsSupportVersion", "private", "<QtKmsSupportVersion>", "public"] },
-  { "symbol": [ "QtLabsAnimationVersion", "private", "<QtLabsAnimationVersion>", "public"] },
-  { "symbol": [ "QtLabsFolderListModelVersion", "private", "<QtLabsFolderListModelVersion>", "public"] },
-  { "symbol": [ "QtLabsPlatformVersion", "private", "<QtLabsPlatformVersion>", "public"] },
-  { "symbol": [ "QtLabsQmlModelsVersion", "private", "<QtLabsQmlModelsVersion>", "public"] },
-  { "symbol": [ "QtLabsSettingsVersion", "private", "<QtLabsSettingsVersion>", "public"] },
-  { "symbol": [ "QtLabsSharedImageVersion", "private", "<QtLabsSharedImageVersion>", "public"] },
-  { "symbol": [ "QtLabsStyleKitImplVersion", "private", "<QtLabsStyleKitImplVersion>", "public"] },
-  { "symbol": [ "QtLabsStyleKitVersion", "private", "<QtLabsStyleKitVersion>", "public"] },
-  { "symbol": [ "QtLabsSynchronizerVersion", "private", "<QtLabsSynchronizerVersion>", "public"] },
-  { "symbol": [ "QtLabsWavefrontMeshVersion", "private", "<QtLabsWavefrontMeshVersion>", "public"] },
-  { "symbol": [ "QtLogging", "private", "<QtLogging>", "public"] },
-  { "symbol": [ "QtMalloc", "private", "<QtMalloc>", "public"] },
-  { "symbol": [ "QtMath", "private", "<QtMath>", "public"] },
-  { "symbol": [ "QtMessageHandler", "private", "<QtMessageHandler>", "public"] },
-  { "symbol": [ "QtMultimediaQuickVersion", "private", "<QtMultimediaQuickVersion>", "public"] },
-  { "symbol": [ "QtMultimediaTestLibVersion", "private", "<QtMultimediaTestLibVersion>", "public"] },
-  { "symbol": [ "QtMultimediaVersion", "private", "<QtMultimediaVersion>", "public"] },
-  { "symbol": [ "QtMultimediaWidgetsVersion", "private", "<QtMultimediaWidgetsVersion>", "public"] },
-  { "symbol": [ "QtNetworkAuthVersion", "private", "<QtNetworkAuthVersion>", "public"] },
-  { "symbol": [ "QtNetworkVersion", "private", "<QtNetworkVersion>", "public"] },
-  { "symbol": [ "QtNumeric", "private", "<QtNumeric>", "public"] },
-  { "symbol": [ "QtOpenGLVersion", "private", "<QtOpenGLVersion>", "public"] },
-  { "symbol": [ "QtOpenGLWidgetsVersion", "private", "<QtOpenGLWidgetsVersion>", "public"] },
-  { "symbol": [ "QtPacketProtocolVersion", "private", "<QtPacketProtocolVersion>", "public"] },
-  { "symbol": [ "QtPdfQuickVersion", "private", "<QtPdfQuickVersion>", "public"] },
-  { "symbol": [ "QtPdfVersion", "private", "<QtPdfVersion>", "public"] },
-  { "symbol": [ "QtPdfWidgetsVersion", "private", "<QtPdfWidgetsVersion>", "public"] },
-  { "symbol": [ "QtPlugin", "private", "<QtPlugin>", "public"] },
-  { "symbol": [ "QtPluginInstanceFunction", "private", "<QtPluginInstanceFunction>", "public"] },
-  { "symbol": [ "QtPluginMetaDataFunction", "private", "<QtPluginMetaDataFunction>", "public"] },
-  { "symbol": [ "QtPrintSupportVersion", "private", "<QtPrintSupportVersion>", "public"] },
-  { "symbol": [ "QtPrivate", "private", "<QtPrivate>", "public"] },
-  { "symbol": [ "QtProcessorDetection", "private", "<QtProcessorDetection>", "public"] },
-  { "symbol": [ "QtQmlCompilerVersion", "private", "<QtQmlCompilerVersion>", "public"] },
-  { "symbol": [ "QtQmlCoreVersion", "private", "<QtQmlCoreVersion>", "public"] },
-  { "symbol": [ "QtQmlDebugVersion", "private", "<QtQmlDebugVersion>", "public"] },
-  { "symbol": [ "QtQmlDomVersion", "private", "<QtQmlDomVersion>", "public"] },
-  { "symbol": [ "QtQmlFormatVersion", "private", "<QtQmlFormatVersion>", "public"] },
-  { "symbol": [ "QtQmlIntegrationVersion", "private", "<QtQmlIntegrationVersion>", "public"] },
-  { "symbol": [ "QtQmlLocalStorageVersion", "private", "<QtQmlLocalStorageVersion>", "public"] },
-  { "symbol": [ "QtQmlMetaVersion", "private", "<QtQmlMetaVersion>", "public"] },
-  { "symbol": [ "QtQmlModelsVersion", "private", "<QtQmlModelsVersion>", "public"] },
-  { "symbol": [ "QtQmlNetworkVersion", "private", "<QtQmlNetworkVersion>", "public"] },
-  { "symbol": [ "QtQmlToolingSettingsVersion", "private", "<QtQmlToolingSettingsVersion>", "public"] },
-  { "symbol": [ "QtQmlTypeRegistrarVersion", "private", "<QtQmlTypeRegistrarVersion>", "public"] },
-  { "symbol": [ "QtQmlVersion", "private", "<QtQmlVersion>", "public"] },
-  { "symbol": [ "QtQmlWorkerScriptVersion", "private", "<QtQmlWorkerScriptVersion>", "public"] },
-  { "symbol": [ "QtQmlXmlListModelVersion", "private", "<QtQmlXmlListModelVersion>", "public"] },
-  { "symbol": [ "QtQmltcVersion", "private", "<QtQmltcVersion>", "public"] },
-  { "symbol": [ "QtQuick3DAssetImportVersion", "private", "<QtQuick3DAssetImportVersion>", "public"] },
-  { "symbol": [ "QtQuick3DAssetUtilsVersion", "private", "<QtQuick3DAssetUtilsVersion>", "public"] },
-  { "symbol": [ "QtQuick3DGlslParserVersion", "private", "<QtQuick3DGlslParserVersion>", "public"] },
-  { "symbol": [ "QtQuick3DHelpersImplVersion", "private", "<QtQuick3DHelpersImplVersion>", "public"] },
-  { "symbol": [ "QtQuick3DHelpersVersion", "private", "<QtQuick3DHelpersVersion>", "public"] },
-  { "symbol": [ "QtQuick3DIblBakerVersion", "private", "<QtQuick3DIblBakerVersion>", "public"] },
-  { "symbol": [ "QtQuick3DParticlesVersion", "private", "<QtQuick3DParticlesVersion>", "public"] },
-  { "symbol": [ "QtQuick3DRuntimeRenderVersion", "private", "<QtQuick3DRuntimeRenderVersion>", "public"] },
-  { "symbol": [ "QtQuick3DSpatialAudioVersion", "private", "<QtQuick3DSpatialAudioVersion>", "public"] },
-  { "symbol": [ "QtQuick3DUtilsVersion", "private", "<QtQuick3DUtilsVersion>", "public"] },
-  { "symbol": [ "QtQuick3DVersion", "private", "<QtQuick3DVersion>", "public"] },
-  { "symbol": [ "QtQuickControls2BasicStyleImplVersion", "private", "<QtQuickControls2BasicStyleImplVersion>", "public"] },
-  { "symbol": [ "QtQuickControls2BasicVersion", "private", "<QtQuickControls2BasicVersion>", "public"] },
-  { "symbol": [ "QtQuickControls2FluentWinUI3StyleImplVersion", "private", "<QtQuickControls2FluentWinUI3StyleImplVersion>", "public"] },
-  { "symbol": [ "QtQuickControls2FusionStyleImplVersion", "private", "<QtQuickControls2FusionStyleImplVersion>", "public"] },
-  { "symbol": [ "QtQuickControls2FusionVersion", "private", "<QtQuickControls2FusionVersion>", "public"] },
-  { "symbol": [ "QtQuickControls2ImagineStyleImplVersion", "private", "<QtQuickControls2ImagineStyleImplVersion>", "public"] },
-  { "symbol": [ "QtQuickControls2ImagineVersion", "private", "<QtQuickControls2ImagineVersion>", "public"] },
-  { "symbol": [ "QtQuickControls2ImplVersion", "private", "<QtQuickControls2ImplVersion>", "public"] },
-  { "symbol": [ "QtQuickControls2MaterialStyleImplVersion", "private", "<QtQuickControls2MaterialStyleImplVersion>", "public"] },
-  { "symbol": [ "QtQuickControls2MaterialVersion", "private", "<QtQuickControls2MaterialVersion>", "public"] },
-  { "symbol": [ "QtQuickControls2UniversalStyleImplVersion", "private", "<QtQuickControls2UniversalStyleImplVersion>", "public"] },
-  { "symbol": [ "QtQuickControls2UniversalVersion", "private", "<QtQuickControls2UniversalVersion>", "public"] },
-  { "symbol": [ "QtQuickControls2Version", "private", "<QtQuickControls2Version>", "public"] },
-  { "symbol": [ "QtQuickControlsTestUtilsVersion", "private", "<QtQuickControlsTestUtilsVersion>", "public"] },
-  { "symbol": [ "QtQuickDialogs2QuickImplVersion", "private", "<QtQuickDialogs2QuickImplVersion>", "public"] },
-  { "symbol": [ "QtQuickDialogs2UtilsVersion", "private", "<QtQuickDialogs2UtilsVersion>", "public"] },
-  { "symbol": [ "QtQuickDialogs2Version", "private", "<QtQuickDialogs2Version>", "public"] },
-  { "symbol": [ "QtQuickEffectsVersion", "private", "<QtQuickEffectsVersion>", "public"] },
-  { "symbol": [ "QtQuickLayoutsVersion", "private", "<QtQuickLayoutsVersion>", "public"] },
-  { "symbol": [ "QtQuickParticlesVersion", "private", "<QtQuickParticlesVersion>", "public"] },
-  { "symbol": [ "QtQuickShapesDesignHelpersVersion", "private", "<QtQuickShapesDesignHelpersVersion>", "public"] },
-  { "symbol": [ "QtQuickShapesVersion", "private", "<QtQuickShapesVersion>", "public"] },
-  { "symbol": [ "QtQuickTemplates2Version", "private", "<QtQuickTemplates2Version>", "public"] },
-  { "symbol": [ "QtQuickTestUtilsVersion", "private", "<QtQuickTestUtilsVersion>", "public"] },
-  { "symbol": [ "QtQuickTestVersion", "private", "<QtQuickTestVersion>", "public"] },
-  { "symbol": [ "QtQuickTimelineBlendTreesVersion", "private", "<QtQuickTimelineBlendTreesVersion>", "public"] },
-  { "symbol": [ "QtQuickTimelineVersion", "private", "<QtQuickTimelineVersion>", "public"] },
-  { "symbol": [ "QtQuickVectorImageGeneratorVersion", "private", "<QtQuickVectorImageGeneratorVersion>", "public"] },
-  { "symbol": [ "QtQuickVectorImageHelpersVersion", "private", "<QtQuickVectorImageHelpersVersion>", "public"] },
-  { "symbol": [ "QtQuickVectorImageVersion", "private", "<QtQuickVectorImageVersion>", "public"] },
-  { "symbol": [ "QtQuickVersion", "private", "<QtQuickVersion>", "public"] },
-  { "symbol": [ "QtQuickWidgetsVersion", "private", "<QtQuickWidgetsVersion>", "public"] },
-  { "symbol": [ "QtResource", "private", "<QtResource>", "public"] },
-  { "symbol": [ "QtScxmlGlobalVersion", "private", "<QtScxmlGlobalVersion>", "public"] },
-  { "symbol": [ "QtScxmlQmlVersion", "private", "<QtScxmlQmlVersion>", "public"] },
-  { "symbol": [ "QtScxmlVersion", "private", "<QtScxmlVersion>", "public"] },
-  { "symbol": [ "QtShaderToolsVersion", "private", "<QtShaderToolsVersion>", "public"] },
-  { "symbol": [ "QtSpatialAudioVersion", "private", "<QtSpatialAudioVersion>", "public"] },
-  { "symbol": [ "QtSqlVersion", "private", "<QtSqlVersion>", "public"] },
-  { "symbol": [ "QtStartUpFunction", "private", "<QtStartUpFunction>", "public"] },
-  { "symbol": [ "QtStateMachineQmlVersion", "private", "<QtStateMachineQmlVersion>", "public"] },
-  { "symbol": [ "QtStateMachineVersion", "private", "<QtStateMachineVersion>", "public"] },
-  { "symbol": [ "QtStdLibDetection", "private", "<QtStdLibDetection>", "public"] },
-  { "symbol": [ "QtSvgVersion", "private", "<QtSvgVersion>", "public"] },
-  { "symbol": [ "QtSvgWidgetsVersion", "private", "<QtSvgWidgetsVersion>", "public"] },
-  { "symbol": [ "QtSwap", "private", "<QtSwap>", "public"] },
-  { "symbol": [ "QtSystemDetection", "private", "<QtSystemDetection>", "public"] },
-  { "symbol": [ "QtTestGui", "private", "<QtTestGui>", "public"] },
-  { "symbol": [ "QtTestNetwork", "private", "<QtTestNetwork>", "public"] },
-  { "symbol": [ "QtTestVersion", "private", "<QtTestVersion>", "public"] },
-  { "symbol": [ "QtTestWidgets", "private", "<QtTestWidgets>", "public"] },
-  { "symbol": [ "QtToolsVersion", "private", "<QtToolsVersion>", "public"] },
-  { "symbol": [ "QtTypeTraits", "private", "<QtTypeTraits>", "public"] },
-  { "symbol": [ "QtUiPluginVersion", "private", "<QtUiPluginVersion>", "public"] },
-  { "symbol": [ "QtUiToolsVersion", "private", "<QtUiToolsVersion>", "public"] },
-  { "symbol": [ "QtVersion", "private", "<QtVersion>", "public"] },
-  { "symbol": [ "QtWaylandClientVersion", "private", "<QtWaylandClientVersion>", "public"] },
-  { "symbol": [ "QtWaylandCompositorIviapplicationVersion", "private", "<QtWaylandCompositorIviapplicationVersion>", "public"] },
-  { "symbol": [ "QtWaylandCompositorPresentationTimeVersion", "private", "<QtWaylandCompositorPresentationTimeVersion>", "public"] },
-  { "symbol": [ "QtWaylandCompositorVersion", "private", "<QtWaylandCompositorVersion>", "public"] },
-  { "symbol": [ "QtWaylandCompositorWLShellVersion", "private", "<QtWaylandCompositorWLShellVersion>", "public"] },
-  { "symbol": [ "QtWaylandCompositorXdgShellVersion", "private", "<QtWaylandCompositorXdgShellVersion>", "public"] },
-  { "symbol": [ "QtWaylandEglCompositorHwIntegrationVersion", "private", "<QtWaylandEglCompositorHwIntegrationVersion>", "public"] },
-  { "symbol": [ "QtWaylandGlobalVersion", "private", "<QtWaylandGlobalVersion>", "public"] },
-  { "symbol": [ "QtWebChannelQuickVersion", "private", "<QtWebChannelQuickVersion>", "public"] },
-  { "symbol": [ "QtWebChannelVersion", "private", "<QtWebChannelVersion>", "public"] },
-  { "symbol": [ "QtWebEngineCoreVersion", "private", "<QtWebEngineCoreVersion>", "public"] },
-  { "symbol": [ "QtWebEngineQuickVersion", "private", "<QtWebEngineQuickVersion>", "public"] },
-  { "symbol": [ "QtWebEngineWidgetsVersion", "private", "<QtWebEngineWidgetsVersion>", "public"] },
-  { "symbol": [ "QtWebSocketsVersion", "private", "<QtWebSocketsVersion>", "public"] },
-  { "symbol": [ "QtWidgetsVersion", "private", "<QtWidgetsVersion>", "public"] },
-  { "symbol": [ "QtWlShellIntegrationVersion", "private", "<QtWlShellIntegrationVersion>", "public"] },
-  { "symbol": [ "QtXmlVersion", "private", "<QtXmlVersion>", "public"] },
-  { "symbol": [ "operator==", "private", "<QSharedPointer>", "public"] },
-  { "symbol": [ "operator!=", "private", "<QSharedPointer>", "public"] },
-  { "symbol": [ "operator<", "private", "<QSharedPointer>", "public"] },
-  { "symbol": [ "operator<=", "private", "<QSharedPointer>", "public"] },
-  { "symbol": [ "operator>", "private", "<QSharedPointer>", "public"] },
-  { "symbol": [ "operator>=", "private", "<QSharedPointer>", "public"] },
-  { "symbol": [ "comparesEqual", "private", "<QSharedPointer>", "public"] },
-  { "include": [ "@[\"<](QtBluetooth/)?qbluetoothaddress\\.h[\">]", "private", "<QBluetoothAddress>", "public"] },
-  { "include": [ "@[\"<](QtBluetooth/)?qbluetoothdevicediscoveryagent\\.h[\">]", "private", "<QBluetoothDeviceDiscoveryAgent>", "public"] },
-  { "include": [ "@[\"<](QtBluetooth/)?qbluetoothdeviceinfo\\.h[\">]", "private", "<QBluetoothDeviceInfo>", "public"] },
-  { "include": [ "@[\"<](QtBluetooth/)?qbluetoothhostinfo\\.h[\">]", "private", "<QBluetoothHostInfo>", "public"] },
-  { "include": [ "@[\"<](QtBluetooth/)?qbluetoothlocaldevice\\.h[\">]", "private", "<QBluetoothLocalDevice>", "public"] },
-  { "include": [ "@[\"<](QtBluetooth/)?qbluetoothserver\\.h[\">]", "private", "<QBluetoothServer>", "public"] },
-  { "include": [ "@[\"<](QtBluetooth/)?qbluetoothservicediscoveryagent\\.h[\">]", "private", "<QBluetoothServiceDiscoveryAgent>", "public"] },
-  { "include": [ "@[\"<](QtBluetooth/)?qbluetoothserviceinfo\\.h[\">]", "private", "<QBluetoothServiceInfo>", "public"] },
-  { "include": [ "@[\"<](QtBluetooth/)?qbluetoothsocket\\.h[\">]", "private", "<QBluetoothSocket>", "public"] },
-  { "include": [ "@[\"<](QtBluetooth/)?qbluetoothuuid\\.h[\">]", "private", "<QBluetoothUuid>", "public"] },
-  { "include": [ "@[\"<](QtBluetooth/)?qlowenergyadvertisingdata\\.h[\">]", "private", "<QLowEnergyAdvertisingData>", "public"] },
-  { "include": [ "@[\"<](QtBluetooth/)?qlowenergyadvertisingparameters\\.h[\">]", "private", "<QLowEnergyAdvertisingParameters>", "public"] },
-  { "include": [ "@[\"<](QtBluetooth/)?qlowenergycharacteristic\\.h[\">]", "private", "<QLowEnergyCharacteristic>", "public"] },
-  { "include": [ "@[\"<](QtBluetooth/)?qlowenergycharacteristicdata\\.h[\">]", "private", "<QLowEnergyCharacteristicData>", "public"] },
-  { "include": [ "@[\"<](QtBluetooth/)?qlowenergyconnectionparameters\\.h[\">]", "private", "<QLowEnergyConnectionParameters>", "public"] },
-  { "include": [ "@[\"<](QtBluetooth/)?qlowenergycontroller\\.h[\">]", "private", "<QLowEnergyController>", "public"] },
-  { "include": [ "@[\"<](QtBluetooth/)?qlowenergydescriptor\\.h[\">]", "private", "<QLowEnergyDescriptor>", "public"] },
-  { "include": [ "@[\"<](QtBluetooth/)?qlowenergydescriptordata\\.h[\">]", "private", "<QLowEnergyDescriptorData>", "public"] },
-  { "include": [ "@[\"<](QtBluetooth/)?qlowenergyservice\\.h[\">]", "private", "<QLowEnergyService>", "public"] },
-  { "include": [ "@[\"<](QtBluetooth/)?qlowenergyservicedata\\.h[\">]", "private", "<QLowEnergyServiceData>", "public"] },
-  { "include": [ "@[\"<](QtBluetooth/)?qtbluetoothversion\\.h[\">]", "private", "<QtBluetoothVersion>", "public"] },
-  { "include": [ "@[\"<](QtConcurrent/)?qtconcurrentfilter\\.h[\">]", "private", "<QtConcurrentFilter>", "public"] },
-  { "include": [ "@[\"<](QtConcurrent/)?qtconcurrentmap\\.h[\">]", "private", "<QtConcurrentMap>", "public"] },
-  { "include": [ "@[\"<](QtConcurrent/)?qtconcurrentrun\\.h[\">]", "private", "<QtConcurrentRun>", "public"] },
-  { "include": [ "@[\"<](QtConcurrent/)?qtconcurrenttask\\.h[\">]", "private", "<QtConcurrentTask>", "public"] },
-  { "include": [ "@[\"<](QtConcurrent/)?qtconcurrentversion\\.h[\">]", "private", "<QtConcurrentVersion>", "public"] },
-  { "include": [ "@[\"<](QtConnectivity/)?qtconnectivityversion\\.h[\">]", "private", "<QtConnectivityVersion>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qabstractanimation\\.h[\">]", "private", "<QAbstractAnimation>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qabstracteventdispatcher\\.h[\">]", "private", "<QAbstractEventDispatcher>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qabstractitemmodel\\.h[\">]", "private", "<QAbstractItemModel>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qabstractnativeeventfilter\\.h[\">]", "private", "<QAbstractNativeEventFilter>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qabstractproxymodel\\.h[\">]", "private", "<QAbstractProxyModel>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qanimationgroup\\.h[\">]", "private", "<QAnimationGroup>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qanystringview\\.h[\">]", "private", "<QAnyStringView>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qapplicationstatic\\.h[\">]", "private", "<QApplicationStatic>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qarraydata\\.h[\">]", "private", "<QArrayData>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qarraydataops\\.h[\">]", "private", "<QArrayDataOps>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qarraydatapointer\\.h[\">]", "private", "<QArrayDataPointer>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qassert\\.h[\">]", "private", "<QtGlobal>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qassociativeiterable\\.h[\">]", "private", "<QAssociativeIterable>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qatomicscopedvaluerollback\\.h[\">]", "private", "<QAtomicScopedValueRollback>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qbasictimer\\.h[\">]", "private", "<QBasicTimer>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qbindingstorage\\.h[\">]", "private", "<QBindingStorage>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qbitarray\\.h[\">]", "private", "<QBitArray>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qbuffer\\.h[\">]", "private", "<QBuffer>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qbytearray\\.h[\">]", "private", "<QByteArray>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qbytearrayalgorithms\\.h[\">]", "private", "<QByteArrayAlgorithms>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qbytearraylist\\.h[\">]", "private", "<QByteArrayList>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qbytearraymatcher\\.h[\">]", "private", "<QByteArrayMatcher>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qbytearrayview\\.h[\">]", "private", "<QByteArrayView>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qcache\\.h[\">]", "private", "<QCache>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qcalendar\\.h[\">]", "private", "<QCalendar>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qcborarray\\.h[\">]", "private", "<QCborArray>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qcbormap\\.h[\">]", "private", "<QCborMap>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qcborstreamreader\\.h[\">]", "private", "<QCborStreamReader>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qcborstreamwriter\\.h[\">]", "private", "<QCborStreamWriter>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qcborvalue\\.h[\">]", "private", "<QCborValue>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qchar\\.h[\">]", "private", "<QChar>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qchronotimer\\.h[\">]", "private", "<QChronoTimer>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qcollator\\.h[\">]", "private", "<QCollator>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qcommandlineoption\\.h[\">]", "private", "<QCommandLineOption>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qcommandlineparser\\.h[\">]", "private", "<QCommandLineParser>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qconcatenatetablesproxymodel\\.h[\">]", "private", "<QConcatenateTablesProxyModel>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qcontiguouscache\\.h[\">]", "private", "<QContiguousCache>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qcoreapplication\\.h[\">]", "private", "<QCoreApplication>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qcryptographichash\\.h[\">]", "private", "<QCryptographicHash>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qdatastream\\.h[\">]", "private", "<QDataStream>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qdatetime\\.h[\">]", "private", "<QDateTime>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qdeadlinetimer\\.h[\">]", "private", "<QDeadlineTimer>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qdebug\\.h[\">]", "private", "<QDebug>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qdir\\.h[\">]", "private", "<QDir>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qdiriterator\\.h[\">]", "private", "<QDirIterator>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qdirlisting\\.h[\">]", "private", "<QDirListing>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qeasingcurve\\.h[\">]", "private", "<QEasingCurve>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qelapsedtimer\\.h[\">]", "private", "<QElapsedTimer>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qeventloop\\.h[\">]", "private", "<QEventLoop>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qexception\\.h[\">]", "private", "<QException>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qfactoryinterface\\.h[\">]", "private", "<QFactoryInterface>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qfile\\.h[\">]", "private", "<QFile>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qfiledevice\\.h[\">]", "private", "<QFileDevice>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qfileinfo\\.h[\">]", "private", "<QFileInfo>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qfileselector\\.h[\">]", "private", "<QFileSelector>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qfilesystemwatcher\\.h[\">]", "private", "<QFileSystemWatcher>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qflags\\.h[\">]", "private", "<QFlags>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qfloat16\\.h[\">]", "private", "<QFloat16>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qforeach\\.h[\">]", "private", "<QForeach>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qfunctionpointer\\.h[\">]", "private", "<QFunctionPointer>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qfuture\\.h[\">]", "private", "<QFuture>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qfutureinterface\\.h[\">]", "private", "<QFutureInterface>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qfuturesynchronizer\\.h[\">]", "private", "<QFutureSynchronizer>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qfuturewatcher\\.h[\">]", "private", "<QFutureWatcher>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qglobalstatic\\.h[\">]", "private", "<QGlobalStatic>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qhash\\.h[\">]", "private", "<QHash>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qhashfunctions\\.h[\">]", "private", "<QHashFunctions>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qidentityproxymodel\\.h[\">]", "private", "<QIdentityProxyModel>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qiodevice\\.h[\">]", "private", "<QIODevice>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qiodevicebase\\.h[\">]", "private", "<QIODeviceBase>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qitemselectionmodel\\.h[\">]", "private", "<QItemSelectionModel>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qiterable\\.h[\">]", "private", "<QIterable>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qjsonarray\\.h[\">]", "private", "<QJsonArray>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qjsondocument\\.h[\">]", "private", "<QJsonDocument>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qjsonobject\\.h[\">]", "private", "<QJsonObject>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qjsonparseerror\\.h[\">]", "private", "<QJsonParseError>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qjsonvalue\\.h[\">]", "private", "<QJsonValue>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qlatin1stringmatcher\\.h[\">]", "private", "<QLatin1StringMatcher>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qlatin1stringview\\.h[\">]", "private", "<QLatin1StringView>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qlibrary\\.h[\">]", "private", "<QLibrary>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qlibraryinfo\\.h[\">]", "private", "<QLibraryInfo>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qline\\.h[\">]", "private", "<QLine>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qlist\\.h[\">]", "private", "<QList>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qlocale\\.h[\">]", "private", "<QLocale>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qlockfile\\.h[\">]", "private", "<QLockFile>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qloggingcategory\\.h[\">]", "private", "<QLoggingCategory>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qmap\\.h[\">]", "private", "<QMap>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qmargins\\.h[\">]", "private", "<QMargins>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qmessageauthenticationcode\\.h[\">]", "private", "<QMessageAuthenticationCode>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qmetaassociation\\.h[\">]", "private", "<QMetaAssociation>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qmetacontainer\\.h[\">]", "private", "<QMetaContainer>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qmetasequence\\.h[\">]", "private", "<QMetaSequence>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qmetatype\\.h[\">]", "private", "<QMetaType>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qmimedata\\.h[\">]", "private", "<QMimeData>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qmimedatabase\\.h[\">]", "private", "<QMimeDatabase>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qmimetype\\.h[\">]", "private", "<QMimeType>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qminmax\\.h[\">]", "private", "<QtGlobal>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qmutex\\.h[\">]", "private", "<QMutex>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qobject\\.h[\">]", "private", "<QObject>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qobjectcleanuphandler\\.h[\">]", "private", "<QObjectCleanupHandler>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qoperatingsystemversion\\.h[\">]", "private", "<QOperatingSystemVersion>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qoverload\\.h[\">]", "private", "<QtGlobal>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qpair\\.h[\">]", "private", "<QPair>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qparallelanimationgroup\\.h[\">]", "private", "<QParallelAnimationGroup>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qpauseanimation\\.h[\">]", "private", "<QPauseAnimation>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qpermissions\\.h[\">]", "private", "<QPermissions>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qpluginloader\\.h[\">]", "private", "<QPluginLoader>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qpoint\\.h[\">]", "private", "<QPoint>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qpointer\\.h[\">]", "private", "<QPointer>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qprocess\\.h[\">]", "private", "<QProcess>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qpromise\\.h[\">]", "private", "<QPromise>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qproperty\\.h[\">]", "private", "<QProperty>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qpropertyanimation\\.h[\">]", "private", "<QPropertyAnimation>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qqueue\\.h[\">]", "private", "<QQueue>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qrangemodel\\.h[\">]", "private", "<QRangeModel>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qrangemodeladapter\\.h[\">]", "private", "<QRangeModelAdapter>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qreadwritelock\\.h[\">]", "private", "<QReadWriteLock>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qrect\\.h[\">]", "private", "<QRect>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qregularexpression\\.h[\">]", "private", "<QRegularExpression>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qresource\\.h[\">]", "private", "<QResource>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qrunnable\\.h[\">]", "private", "<QRunnable>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qsavefile\\.h[\">]", "private", "<QSaveFile>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qscopedpointer\\.h[\">]", "private", "<QScopedPointer>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qscopedvaluerollback\\.h[\">]", "private", "<QScopedValueRollback>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qscopeguard\\.h[\">]", "private", "<QScopeGuard>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qsemaphore\\.h[\">]", "private", "<QSemaphore>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qsequentialanimationgroup\\.h[\">]", "private", "<QSequentialAnimationGroup>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qsequentialiterable\\.h[\">]", "private", "<QSequentialIterable>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qset\\.h[\">]", "private", "<QSet>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qsettings\\.h[\">]", "private", "<QSettings>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qshareddata\\.h[\">]", "private", "<QSharedData>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qsharedmemory\\.h[\">]", "private", "<QSharedMemory>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qsharedpointer\\.h[\">]", "private", "<QSharedPointer>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qsignalmapper\\.h[\">]", "private", "<QSignalMapper>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qsize\\.h[\">]", "private", "<QSize>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qsocketnotifier\\.h[\">]", "private", "<QSocketNotifier>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qsortfilterproxymodel\\.h[\">]", "private", "<QSortFilterProxyModel>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qspan\\.h[\">]", "private", "<QSpan>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qstack\\.h[\">]", "private", "<QStack>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qstandardpaths\\.h[\">]", "private", "<QStandardPaths>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qstaticlatin1stringmatcher\\.h[\">]", "private", "<QStaticLatin1StringMatcher>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qstorageinfo\\.h[\">]", "private", "<QStorageInfo>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qstring\\.h[\">]", "private", "<QString>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qstringalgorithms\\.h[\">]", "private", "<QStringAlgorithms>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qstringbuilder\\.h[\">]", "private", "<QStringBuilder>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qstringconverter\\.h[\">]", "private", "<QStringConverter>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qstringlist\\.h[\">]", "private", "<QStringList>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qstringlistmodel\\.h[\">]", "private", "<QStringListModel>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qstringliteral\\.h[\">]", "private", "<QStringLiteral>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qstringmatcher\\.h[\">]", "private", "<QStringMatcher>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qstringtokenizer\\.h[\">]", "private", "<QStringTokenizer>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qstringview\\.h[\">]", "private", "<QStringView>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qsysinfo\\.h[\">]", "private", "<QSysInfo>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qsystemsemaphore\\.h[\">]", "private", "<QSystemSemaphore>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qtaggedpointer\\.h[\">]", "private", "<QTaggedPointer>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qtclasshelpermacros\\.h[\">]", "private", "<QtGlobal>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qtcoreglobal\\.h[\">]", "private", "<QtCoreGlobal>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qtcoreversion\\.h[\">]", "private", "<QtCoreVersion>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qtdeprecationmarkers\\.h[\">]", "private", "<QtDeprecationMarkers>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qtemporarydir\\.h[\">]", "private", "<QTemporaryDir>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qtemporaryfile\\.h[\">]", "private", "<QTemporaryFile>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qtenvironmentvariables\\.h[\">]", "private", "<QtGlobal>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qtextboundaryfinder\\.h[\">]", "private", "<QTextBoundaryFinder>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qtextstream\\.h[\">]", "private", "<QTextStream>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qthread\\.h[\">]", "private", "<QThread>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qthreadpool\\.h[\">]", "private", "<QThreadPool>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qthreadstorage\\.h[\">]", "private", "<QThreadStorage>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qtimeline\\.h[\">]", "private", "<QTimeLine>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qtimer\\.h[\">]", "private", "<QTimer>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qtimezone\\.h[\">]", "private", "<QTimeZone>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qtpreprocessorsupport\\.h[\">]", "private", "<QtGlobal>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qtranslator\\.h[\">]", "private", "<QTranslator>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qtransposeproxymodel\\.h[\">]", "private", "<QTransposeProxyModel>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qtresource\\.h[\">]", "private", "<QtResource>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qttranslation\\.h[\">]", "private", "<QtGlobal>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qttypetraits\\.h[\">]", "private", "<QtTypeTraits>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qtversion\\.h[\">]", "private", "<QtVersion>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qtversionchecks\\.h[\">]", "private", "<QtGlobal>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qtypeinfo\\.h[\">]", "private", "<QTypeInfo>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qtyperevision\\.h[\">]", "private", "<QTypeRevision>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qtypes\\.h[\">]", "private", "<QtGlobal>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qurl\\.h[\">]", "private", "<QUrl>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qurlquery\\.h[\">]", "private", "<QUrlQuery>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qutf8stringview\\.h[\">]", "private", "<QUtf8StringView>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?quuid\\.h[\">]", "private", "<QUuid>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qvariant\\.h[\">]", "private", "<QVariant>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qvariantanimation\\.h[\">]", "private", "<QVariantAnimation>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qvarianthash\\.h[\">]", "private", "<QVariantHash>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qvariantlist\\.h[\">]", "private", "<QVariantList>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qvariantmap\\.h[\">]", "private", "<QVariantMap>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qvarlengtharray\\.h[\">]", "private", "<QVarLengthArray>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qvector\\.h[\">]", "private", "<QVector>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qversionnumber\\.h[\">]", "private", "<QVersionNumber>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qwaitcondition\\.h[\">]", "private", "<QWaitCondition>", "public"] },
-  { "include": [ "@[\"<](QtCore/)?qwineventnotifier\\.h[\">]", "private", "<QWinEventNotifier>", "public"] },
-  { "include": [ "@[\"<](QtCore5Compat/)?qbinaryjson\\.h[\">]", "private", "<QBinaryJson>", "public"] },
-  { "include": [ "@[\"<](QtCore5Compat/)?qlinkedlist\\.h[\">]", "private", "<QLinkedList>", "public"] },
-  { "include": [ "@[\"<](QtCore5Compat/)?qregexp\\.h[\">]", "private", "<QRegExp>", "public"] },
-  { "include": [ "@[\"<](QtCore5Compat/)?qstringref\\.h[\">]", "private", "<QStringRef>", "public"] },
-  { "include": [ "@[\"<](QtCore5Compat/)?qtcore5compatversion\\.h[\">]", "private", "<QtCore5CompatVersion>", "public"] },
-  { "include": [ "@[\"<](QtCore5Compat/)?qtextcodec\\.h[\">]", "private", "<QTextCodec>", "public"] },
-  { "include": [ "@[\"<](QtDBus/)?qdbusabstractadaptor\\.h[\">]", "private", "<QDBusAbstractAdaptor>", "public"] },
-  { "include": [ "@[\"<](QtDBus/)?qdbusabstractinterface\\.h[\">]", "private", "<QDBusAbstractInterface>", "public"] },
-  { "include": [ "@[\"<](QtDBus/)?qdbusargument\\.h[\">]", "private", "<QDBusArgument>", "public"] },
-  { "include": [ "@[\"<](QtDBus/)?qdbusconnection\\.h[\">]", "private", "<QDBusConnection>", "public"] },
-  { "include": [ "@[\"<](QtDBus/)?qdbusconnectioninterface\\.h[\">]", "private", "<QDBusConnectionInterface>", "public"] },
-  { "include": [ "@[\"<](QtDBus/)?qdbuscontext\\.h[\">]", "private", "<QDBusContext>", "public"] },
-  { "include": [ "@[\"<](QtDBus/)?qdbuserror\\.h[\">]", "private", "<QDBusError>", "public"] },
-  { "include": [ "@[\"<](QtDBus/)?qdbusinterface\\.h[\">]", "private", "<QDBusInterface>", "public"] },
-  { "include": [ "@[\"<](QtDBus/)?qdbusmessage\\.h[\">]", "private", "<QDBusMessage>", "public"] },
-  { "include": [ "@[\"<](QtDBus/)?qdbusmetatype\\.h[\">]", "private", "<QDBusMetaType>", "public"] },
-  { "include": [ "@[\"<](QtDBus/)?qdbuspendingcall\\.h[\">]", "private", "<QDBusPendingCall>", "public"] },
-  { "include": [ "@[\"<](QtDBus/)?qdbuspendingreply\\.h[\">]", "private", "<QDBusPendingReply>", "public"] },
-  { "include": [ "@[\"<](QtDBus/)?qdbusreply\\.h[\">]", "private", "<QDBusReply>", "public"] },
-  { "include": [ "@[\"<](QtDBus/)?qdbusserver\\.h[\">]", "private", "<QDBusServer>", "public"] },
-  { "include": [ "@[\"<](QtDBus/)?qdbusservicewatcher\\.h[\">]", "private", "<QDBusServiceWatcher>", "public"] },
-  { "include": [ "@[\"<](QtDBus/)?qdbusunixfiledescriptor\\.h[\">]", "private", "<QDBusUnixFileDescriptor>", "public"] },
-  { "include": [ "@[\"<](QtDBus/)?qdbusvirtualobject\\.h[\">]", "private", "<QDBusVirtualObject>", "public"] },
-  { "include": [ "@[\"<](QtDBus/)?qtdbusversion\\.h[\">]", "private", "<QtDBusVersion>", "public"] },
-  { "include": [ "@[\"<](QtDeviceDiscoverySupport/)?qtdevicediscoverysupportversion\\.h[\">]", "private", "<QtDeviceDiscoverySupportVersion>", "public"] },
-  { "include": [ "@[\"<](QtFFmpegMediaPluginImpl/)?qtffmpegmediapluginimplversion\\.h[\">]", "private", "<QtFFmpegMediaPluginImplVersion>", "public"] },
-  { "include": [ "@[\"<](QtFbSupport/)?qtfbsupportversion\\.h[\">]", "private", "<QtFbSupportVersion>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qabstractfileiconprovider\\.h[\">]", "private", "<QAbstractFileIconProvider>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qabstracttextdocumentlayout\\.h[\">]", "private", "<QAbstractTextDocumentLayout>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qaccessibilityhints\\.h[\">]", "private", "<QAccessibilityHints>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qaccessible\\.h[\">]", "private", "<QAccessible>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qaccessiblebridge\\.h[\">]", "private", "<QAccessibleBridge>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qaccessibleobject\\.h[\">]", "private", "<QAccessibleObject>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qaccessibleplugin\\.h[\">]", "private", "<QAccessiblePlugin>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qaction\\.h[\">]", "private", "<QAction>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qactiongroup\\.h[\">]", "private", "<QActionGroup>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qbackingstore\\.h[\">]", "private", "<QBackingStore>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qbitmap\\.h[\">]", "private", "<QBitmap>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qbrush\\.h[\">]", "private", "<QBrush>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qclipboard\\.h[\">]", "private", "<QClipboard>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qcolor\\.h[\">]", "private", "<QColor>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qcolorspace\\.h[\">]", "private", "<QColorSpace>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qcolortransform\\.h[\">]", "private", "<QColorTransform>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qcursor\\.h[\">]", "private", "<QCursor>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qdesktopservices\\.h[\">]", "private", "<QDesktopServices>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qdrag\\.h[\">]", "private", "<QDrag>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qeventpoint\\.h[\">]", "private", "<QEventPoint>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qfilesystemmodel\\.h[\">]", "private", "<QFileSystemModel>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qfont\\.h[\">]", "private", "<QFont>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qfontdatabase\\.h[\">]", "private", "<QFontDatabase>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qfontinfo\\.h[\">]", "private", "<QFontInfo>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qfontmetrics\\.h[\">]", "private", "<QFontMetrics>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qfontvariableaxis\\.h[\">]", "private", "<QFontVariableAxis>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qgenericmatrix\\.h[\">]", "private", "<QGenericMatrix>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qgenericplugin\\.h[\">]", "private", "<QGenericPlugin>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qgenericpluginfactory\\.h[\">]", "private", "<QGenericPluginFactory>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qglyphrun\\.h[\">]", "private", "<QGlyphRun>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qguiapplication\\.h[\">]", "private", "<QGuiApplication>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qicon\\.h[\">]", "private", "<QIcon>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qiconengine\\.h[\">]", "private", "<QIconEngine>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qiconengineplugin\\.h[\">]", "private", "<QIconEnginePlugin>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qimage\\.h[\">]", "private", "<QImage>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qimageiohandler\\.h[\">]", "private", "<QImageIOHandler>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qimagereader\\.h[\">]", "private", "<QImageReader>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qimagewriter\\.h[\">]", "private", "<QImageWriter>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qinputdevice\\.h[\">]", "private", "<QInputDevice>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qinputmethod\\.h[\">]", "private", "<QInputMethod>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qkeysequence\\.h[\">]", "private", "<QKeySequence>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qmatrix4x4\\.h[\">]", "private", "<QMatrix4x4>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qmovie\\.h[\">]", "private", "<QMovie>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qoffscreensurface\\.h[\">]", "private", "<QOffscreenSurface>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qopenglcontext\\.h[\">]", "private", "<QOpenGLContext>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qopenglextrafunctions\\.h[\">]", "private", "<QOpenGLExtraFunctions>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qopenglfunctions\\.h[\">]", "private", "<QOpenGLFunctions>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qpagedpaintdevice\\.h[\">]", "private", "<QPagedPaintDevice>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qpagelayout\\.h[\">]", "private", "<QPageLayout>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qpageranges\\.h[\">]", "private", "<QPageRanges>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qpagesize\\.h[\">]", "private", "<QPageSize>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qpaintdevice\\.h[\">]", "private", "<QPaintDevice>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qpaintdevicewindow\\.h[\">]", "private", "<QPaintDeviceWindow>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qpaintengine\\.h[\">]", "private", "<QPaintEngine>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qpainter\\.h[\">]", "private", "<QPainter>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qpainterpath\\.h[\">]", "private", "<QPainterPath>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qpainterstateguard\\.h[\">]", "private", "<QPainterStateGuard>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qpalette\\.h[\">]", "private", "<QPalette>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qpdfoutputintent\\.h[\">]", "private", "<QPdfOutputIntent>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qpdfwriter\\.h[\">]", "private", "<QPdfWriter>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qpen\\.h[\">]", "private", "<QPen>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qpicture\\.h[\">]", "private", "<QPicture>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qpixelformat\\.h[\">]", "private", "<QPixelFormat>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qpixmap\\.h[\">]", "private", "<QPixmap>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qpixmapcache\\.h[\">]", "private", "<QPixmapCache>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qpointingdevice\\.h[\">]", "private", "<QPointingDevice>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qpolygon\\.h[\">]", "private", "<QPolygon>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qquaternion\\.h[\">]", "private", "<QQuaternion>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qrasterwindow\\.h[\">]", "private", "<QRasterWindow>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qrawfont\\.h[\">]", "private", "<QRawFont>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qregion\\.h[\">]", "private", "<QRegion>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qrgb\\.h[\">]", "private", "<QRgb>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qrgba64\\.h[\">]", "private", "<QRgba64>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qrgbafloat\\.h[\">]", "private", "<QRgbaFloat>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qscreen\\.h[\">]", "private", "<QScreen>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qsessionmanager\\.h[\">]", "private", "<QSessionManager>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qshortcut\\.h[\">]", "private", "<QShortcut>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qstandarditemmodel\\.h[\">]", "private", "<QStandardItemModel>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qstatictext\\.h[\">]", "private", "<QStaticText>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qstylehints\\.h[\">]", "private", "<QStyleHints>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qsurface\\.h[\">]", "private", "<QSurface>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qsurfaceformat\\.h[\">]", "private", "<QSurfaceFormat>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qsyntaxhighlighter\\.h[\">]", "private", "<QSyntaxHighlighter>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qtextcursor\\.h[\">]", "private", "<QTextCursor>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qtextdocument\\.h[\">]", "private", "<QTextDocument>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qtextdocumentfragment\\.h[\">]", "private", "<QTextDocumentFragment>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qtextdocumentwriter\\.h[\">]", "private", "<QTextDocumentWriter>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qtextformat\\.h[\">]", "private", "<QTextFormat>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qtextlayout\\.h[\">]", "private", "<QTextLayout>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qtextlist\\.h[\">]", "private", "<QTextList>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qtextobject\\.h[\">]", "private", "<QTextObject>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qtextoption\\.h[\">]", "private", "<QTextOption>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qtexttable\\.h[\">]", "private", "<QTextTable>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qtguiversion\\.h[\">]", "private", "<QtGuiVersion>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qtransform\\.h[\">]", "private", "<QTransform>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qundogroup\\.h[\">]", "private", "<QUndoGroup>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qundostack\\.h[\">]", "private", "<QUndoStack>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qvalidator\\.h[\">]", "private", "<QValidator>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qvulkanfunctions\\.h[\">]", "private", "<QVulkanFunctions>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qvulkaninstance\\.h[\">]", "private", "<QVulkanInstance>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qvulkanwindow\\.h[\">]", "private", "<QVulkanWindow>", "public"] },
-  { "include": [ "@[\"<](QtGui/)?qwindow\\.h[\">]", "private", "<QWindow>", "public"] },
-  { "include": [ "@[\"<](QtHelp/)?qcompressedhelpinfo\\.h[\">]", "private", "<QCompressedHelpInfo>", "public"] },
-  { "include": [ "@[\"<](QtHelp/)?qhelpcontentitem\\.h[\">]", "private", "<QHelpContentItem>", "public"] },
-  { "include": [ "@[\"<](QtHelp/)?qhelpcontentwidget\\.h[\">]", "private", "<QHelpContentWidget>", "public"] },
-  { "include": [ "@[\"<](QtHelp/)?qhelpengine\\.h[\">]", "private", "<QHelpEngine>", "public"] },
-  { "include": [ "@[\"<](QtHelp/)?qhelpenginecore\\.h[\">]", "private", "<QHelpEngineCore>", "public"] },
-  { "include": [ "@[\"<](QtHelp/)?qhelpfilterdata\\.h[\">]", "private", "<QHelpFilterData>", "public"] },
-  { "include": [ "@[\"<](QtHelp/)?qhelpfilterengine\\.h[\">]", "private", "<QHelpFilterEngine>", "public"] },
-  { "include": [ "@[\"<](QtHelp/)?qhelpfiltersettingswidget\\.h[\">]", "private", "<QHelpFilterSettingsWidget>", "public"] },
-  { "include": [ "@[\"<](QtHelp/)?qhelpindexwidget\\.h[\">]", "private", "<QHelpIndexWidget>", "public"] },
-  { "include": [ "@[\"<](QtHelp/)?qhelplink\\.h[\">]", "private", "<QHelpLink>", "public"] },
-  { "include": [ "@[\"<](QtHelp/)?qhelpsearchengine\\.h[\">]", "private", "<QHelpSearchEngine>", "public"] },
-  { "include": [ "@[\"<](QtHelp/)?qhelpsearchenginecore\\.h[\">]", "private", "<QHelpSearchEngineCore>", "public"] },
-  { "include": [ "@[\"<](QtHelp/)?qhelpsearchquerywidget\\.h[\">]", "private", "<QHelpSearchQueryWidget>", "public"] },
-  { "include": [ "@[\"<](QtHelp/)?qhelpsearchresult\\.h[\">]", "private", "<QHelpSearchResult>", "public"] },
-  { "include": [ "@[\"<](QtHelp/)?qhelpsearchresultwidget\\.h[\">]", "private", "<QHelpSearchResultWidget>", "public"] },
-  { "include": [ "@[\"<](QtHelp/)?qthelpversion\\.h[\">]", "private", "<QtHelpVersion>", "public"] },
-  { "include": [ "@[\"<](QtInputSupport/)?qtinputsupportversion\\.h[\">]", "private", "<QtInputSupportVersion>", "public"] },
-  { "include": [ "@[\"<](QtKmsSupport/)?qtkmssupportversion\\.h[\">]", "private", "<QtKmsSupportVersion>", "public"] },
-  { "include": [ "@[\"<](QtLabsAnimation/)?qtlabsanimationversion\\.h[\">]", "private", "<QtLabsAnimationVersion>", "public"] },
-  { "include": [ "@[\"<](QtLabsFolderListModel/)?qtlabsfolderlistmodelversion\\.h[\">]", "private", "<QtLabsFolderListModelVersion>", "public"] },
-  { "include": [ "@[\"<](QtLabsPlatform/)?qtlabsplatformversion\\.h[\">]", "private", "<QtLabsPlatformVersion>", "public"] },
-  { "include": [ "@[\"<](QtLabsQmlModels/)?qtlabsqmlmodelsversion\\.h[\">]", "private", "<QtLabsQmlModelsVersion>", "public"] },
-  { "include": [ "@[\"<](QtLabsSettings/)?qtlabssettingsversion\\.h[\">]", "private", "<QtLabsSettingsVersion>", "public"] },
-  { "include": [ "@[\"<](QtLabsSharedImage/)?qtlabssharedimageversion\\.h[\">]", "private", "<QtLabsSharedImageVersion>", "public"] },
-  { "include": [ "@[\"<](QtLabsStyleKit/)?qtlabsstylekitversion\\.h[\">]", "private", "<QtLabsStyleKitVersion>", "public"] },
-  { "include": [ "@[\"<](QtLabsStyleKitImpl/)?qtlabsstylekitimplversion\\.h[\">]", "private", "<QtLabsStyleKitImplVersion>", "public"] },
-  { "include": [ "@[\"<](QtLabsSynchronizer/)?qtlabssynchronizerversion\\.h[\">]", "private", "<QtLabsSynchronizerVersion>", "public"] },
-  { "include": [ "@[\"<](QtLabsWavefrontMesh/)?qtlabswavefrontmeshversion\\.h[\">]", "private", "<QtLabsWavefrontMeshVersion>", "public"] },
-  { "include": [ "@[\"<](QtMultimedia/)?qabstractvideobuffer\\.h[\">]", "private", "<QAbstractVideoBuffer>", "public"] },
-  { "include": [ "@[\"<](QtMultimedia/)?qaudio\\.h[\">]", "private", "<QAudio>", "public"] },
-  { "include": [ "@[\"<](QtMultimedia/)?qaudiobuffer\\.h[\">]", "private", "<QAudioBuffer>", "public"] },
-  { "include": [ "@[\"<](QtMultimedia/)?qaudiobufferinput\\.h[\">]", "private", "<QAudioBufferInput>", "public"] },
-  { "include": [ "@[\"<](QtMultimedia/)?qaudiobufferoutput\\.h[\">]", "private", "<QAudioBufferOutput>", "public"] },
-  { "include": [ "@[\"<](QtMultimedia/)?qaudiodecoder\\.h[\">]", "private", "<QAudioDecoder>", "public"] },
-  { "include": [ "@[\"<](QtMultimedia/)?qaudiodevice\\.h[\">]", "private", "<QAudioDevice>", "public"] },
-  { "include": [ "@[\"<](QtMultimedia/)?qaudioformat\\.h[\">]", "private", "<QAudioFormat>", "public"] },
-  { "include": [ "@[\"<](QtMultimedia/)?qaudioinput\\.h[\">]", "private", "<QAudioInput>", "public"] },
-  { "include": [ "@[\"<](QtMultimedia/)?qaudiooutput\\.h[\">]", "private", "<QAudioOutput>", "public"] },
-  { "include": [ "@[\"<](QtMultimedia/)?qaudiosink\\.h[\">]", "private", "<QAudioSink>", "public"] },
-  { "include": [ "@[\"<](QtMultimedia/)?qaudiosource\\.h[\">]", "private", "<QAudioSource>", "public"] },
-  { "include": [ "@[\"<](QtMultimedia/)?qcamera\\.h[\">]", "private", "<QCamera>", "public"] },
-  { "include": [ "@[\"<](QtMultimedia/)?qcameradevice\\.h[\">]", "private", "<QCameraDevice>", "public"] },
-  { "include": [ "@[\"<](QtMultimedia/)?qcapturablewindow\\.h[\">]", "private", "<QCapturableWindow>", "public"] },
-  { "include": [ "@[\"<](QtMultimedia/)?qimagecapture\\.h[\">]", "private", "<QImageCapture>", "public"] },
-  { "include": [ "@[\"<](QtMultimedia/)?qmediacapturesession\\.h[\">]", "private", "<QMediaCaptureSession>", "public"] },
-  { "include": [ "@[\"<](QtMultimedia/)?qmediadevices\\.h[\">]", "private", "<QMediaDevices>", "public"] },
-  { "include": [ "@[\"<](QtMultimedia/)?qmediaformat\\.h[\">]", "private", "<QMediaFormat>", "public"] },
-  { "include": [ "@[\"<](QtMultimedia/)?qmediametadata\\.h[\">]", "private", "<QMediaMetaData>", "public"] },
-  { "include": [ "@[\"<](QtMultimedia/)?qmediaplayer\\.h[\">]", "private", "<QMediaPlayer>", "public"] },
-  { "include": [ "@[\"<](QtMultimedia/)?qmediarecorder\\.h[\">]", "private", "<QMediaRecorder>", "public"] },
-  { "include": [ "@[\"<](QtMultimedia/)?qmediatimerange\\.h[\">]", "private", "<QMediaTimeRange>", "public"] },
-  { "include": [ "@[\"<](QtMultimedia/)?qplaybackoptions\\.h[\">]", "private", "<QPlaybackOptions>", "public"] },
-  { "include": [ "@[\"<](QtMultimedia/)?qscreencapture\\.h[\">]", "private", "<QScreenCapture>", "public"] },
-  { "include": [ "@[\"<](QtMultimedia/)?qsoundeffect\\.h[\">]", "private", "<QSoundEffect>", "public"] },
-  { "include": [ "@[\"<](QtMultimedia/)?qtaudio\\.h[\">]", "private", "<QtAudio>", "public"] },
-  { "include": [ "@[\"<](QtMultimedia/)?qtmultimediaversion\\.h[\">]", "private", "<QtMultimediaVersion>", "public"] },
-  { "include": [ "@[\"<](QtMultimedia/)?qvideoframe\\.h[\">]", "private", "<QVideoFrame>", "public"] },
-  { "include": [ "@[\"<](QtMultimedia/)?qvideoframeformat\\.h[\">]", "private", "<QVideoFrameFormat>", "public"] },
-  { "include": [ "@[\"<](QtMultimedia/)?qvideoframeinput\\.h[\">]", "private", "<QVideoFrameInput>", "public"] },
-  { "include": [ "@[\"<](QtMultimedia/)?qvideosink\\.h[\">]", "private", "<QVideoSink>", "public"] },
-  { "include": [ "@[\"<](QtMultimedia/)?qwavedecoder\\.h[\">]", "private", "<QWaveDecoder>", "public"] },
-  { "include": [ "@[\"<](QtMultimedia/)?qwindowcapture\\.h[\">]", "private", "<QWindowCapture>", "public"] },
-  { "include": [ "@[\"<](QtMultimediaQuick/)?qtmultimediaquickversion\\.h[\">]", "private", "<QtMultimediaQuickVersion>", "public"] },
-  { "include": [ "@[\"<](QtMultimediaTestLib/)?qtmultimediatestlibversion\\.h[\">]", "private", "<QtMultimediaTestLibVersion>", "public"] },
-  { "include": [ "@[\"<](QtMultimediaWidgets/)?qgraphicsvideoitem\\.h[\">]", "private", "<QGraphicsVideoItem>", "public"] },
-  { "include": [ "@[\"<](QtMultimediaWidgets/)?qtmultimediawidgetsversion\\.h[\">]", "private", "<QtMultimediaWidgetsVersion>", "public"] },
-  { "include": [ "@[\"<](QtMultimediaWidgets/)?qvideowidget\\.h[\">]", "private", "<QVideoWidget>", "public"] },
-  { "include": [ "@[\"<](QtNetwork/)?qabstractnetworkcache\\.h[\">]", "private", "<QAbstractNetworkCache>", "public"] },
-  { "include": [ "@[\"<](QtNetwork/)?qabstractsocket\\.h[\">]", "private", "<QAbstractSocket>", "public"] },
-  { "include": [ "@[\"<](QtNetwork/)?qauthenticator\\.h[\">]", "private", "<QAuthenticator>", "public"] },
-  { "include": [ "@[\"<](QtNetwork/)?qdnslookup\\.h[\">]", "private", "<QDnsLookup>", "public"] },
-  { "include": [ "@[\"<](QtNetwork/)?qdtls\\.h[\">]", "private", "<QDtls>", "public"] },
-  { "include": [ "@[\"<](QtNetwork/)?qformdatabuilder\\.h[\">]", "private", "<QFormDataBuilder>", "public"] },
-  { "include": [ "@[\"<](QtNetwork/)?qhostaddress\\.h[\">]", "private", "<QHostAddress>", "public"] },
-  { "include": [ "@[\"<](QtNetwork/)?qhostinfo\\.h[\">]", "private", "<QHostInfo>", "public"] },
-  { "include": [ "@[\"<](QtNetwork/)?qhstspolicy\\.h[\">]", "private", "<QHstsPolicy>", "public"] },
-  { "include": [ "@[\"<](QtNetwork/)?qhttp1configuration\\.h[\">]", "private", "<QHttp1Configuration>", "public"] },
-  { "include": [ "@[\"<](QtNetwork/)?qhttp2configuration\\.h[\">]", "private", "<QHttp2Configuration>", "public"] },
-  { "include": [ "@[\"<](QtNetwork/)?qhttpheaders\\.h[\">]", "private", "<QHttpHeaders>", "public"] },
-  { "include": [ "@[\"<](QtNetwork/)?qhttpmultipart\\.h[\">]", "private", "<QHttpMultiPart>", "public"] },
-  { "include": [ "@[\"<](QtNetwork/)?qlocalserver\\.h[\">]", "private", "<QLocalServer>", "public"] },
-  { "include": [ "@[\"<](QtNetwork/)?qlocalsocket\\.h[\">]", "private", "<QLocalSocket>", "public"] },
-  { "include": [ "@[\"<](QtNetwork/)?qnetworkaccessmanager\\.h[\">]", "private", "<QNetworkAccessManager>", "public"] },
-  { "include": [ "@[\"<](QtNetwork/)?qnetworkcookie\\.h[\">]", "private", "<QNetworkCookie>", "public"] },
-  { "include": [ "@[\"<](QtNetwork/)?qnetworkcookiejar\\.h[\">]", "private", "<QNetworkCookieJar>", "public"] },
-  { "include": [ "@[\"<](QtNetwork/)?qnetworkdatagram\\.h[\">]", "private", "<QNetworkDatagram>", "public"] },
-  { "include": [ "@[\"<](QtNetwork/)?qnetworkdiskcache\\.h[\">]", "private", "<QNetworkDiskCache>", "public"] },
-  { "include": [ "@[\"<](QtNetwork/)?qnetworkinformation\\.h[\">]", "private", "<QNetworkInformation>", "public"] },
-  { "include": [ "@[\"<](QtNetwork/)?qnetworkinterface\\.h[\">]", "private", "<QNetworkInterface>", "public"] },
-  { "include": [ "@[\"<](QtNetwork/)?qnetworkproxy\\.h[\">]", "private", "<QNetworkProxy>", "public"] },
-  { "include": [ "@[\"<](QtNetwork/)?qnetworkreply\\.h[\">]", "private", "<QNetworkReply>", "public"] },
-  { "include": [ "@[\"<](QtNetwork/)?qnetworkrequest\\.h[\">]", "private", "<QNetworkRequest>", "public"] },
-  { "include": [ "@[\"<](QtNetwork/)?qnetworkrequestfactory\\.h[\">]", "private", "<QNetworkRequestFactory>", "public"] },
-  { "include": [ "@[\"<](QtNetwork/)?qocspresponse\\.h[\">]", "private", "<QOcspResponse>", "public"] },
-  { "include": [ "@[\"<](QtNetwork/)?qpassworddigestor\\.h[\">]", "private", "<QPasswordDigestor>", "public"] },
-  { "include": [ "@[\"<](QtNetwork/)?qrestaccessmanager\\.h[\">]", "private", "<QRestAccessManager>", "public"] },
-  { "include": [ "@[\"<](QtNetwork/)?qrestreply\\.h[\">]", "private", "<QRestReply>", "public"] },
-  { "include": [ "@[\"<](QtNetwork/)?qssl\\.h[\">]", "private", "<QSsl>", "public"] },
-  { "include": [ "@[\"<](QtNetwork/)?qsslcertificate\\.h[\">]", "private", "<QSslCertificate>", "public"] },
-  { "include": [ "@[\"<](QtNetwork/)?qsslcertificateextension\\.h[\">]", "private", "<QSslCertificateExtension>", "public"] },
-  { "include": [ "@[\"<](QtNetwork/)?qsslcipher\\.h[\">]", "private", "<QSslCipher>", "public"] },
-  { "include": [ "@[\"<](QtNetwork/)?qsslconfiguration\\.h[\">]", "private", "<QSslConfiguration>", "public"] },
-  { "include": [ "@[\"<](QtNetwork/)?qssldiffiehellmanparameters\\.h[\">]", "private", "<QSslDiffieHellmanParameters>", "public"] },
-  { "include": [ "@[\"<](QtNetwork/)?qsslellipticcurve\\.h[\">]", "private", "<QSslEllipticCurve>", "public"] },
-  { "include": [ "@[\"<](QtNetwork/)?qsslerror\\.h[\">]", "private", "<QSslError>", "public"] },
-  { "include": [ "@[\"<](QtNetwork/)?qsslkey\\.h[\">]", "private", "<QSslKey>", "public"] },
-  { "include": [ "@[\"<](QtNetwork/)?qsslpresharedkeyauthenticator\\.h[\">]", "private", "<QSslPreSharedKeyAuthenticator>", "public"] },
-  { "include": [ "@[\"<](QtNetwork/)?qsslserver\\.h[\">]", "private", "<QSslServer>", "public"] },
-  { "include": [ "@[\"<](QtNetwork/)?qsslsocket\\.h[\">]", "private", "<QSslSocket>", "public"] },
-  { "include": [ "@[\"<](QtNetwork/)?qtcpserver\\.h[\">]", "private", "<QTcpServer>", "public"] },
-  { "include": [ "@[\"<](QtNetwork/)?qtcpsocket\\.h[\">]", "private", "<QTcpSocket>", "public"] },
-  { "include": [ "@[\"<](QtNetwork/)?qtnetworkversion\\.h[\">]", "private", "<QtNetworkVersion>", "public"] },
-  { "include": [ "@[\"<](QtNetwork/)?qudpsocket\\.h[\">]", "private", "<QUdpSocket>", "public"] },
-  { "include": [ "@[\"<](QtNetworkAuth/)?qabstractoauth\\.h[\">]", "private", "<QAbstractOAuth>", "public"] },
-  { "include": [ "@[\"<](QtNetworkAuth/)?qabstractoauth2\\.h[\">]", "private", "<QAbstractOAuth2>", "public"] },
-  { "include": [ "@[\"<](QtNetworkAuth/)?qabstractoauthreplyhandler\\.h[\">]", "private", "<QAbstractOAuthReplyHandler>", "public"] },
-  { "include": [ "@[\"<](QtNetworkAuth/)?qoauth1\\.h[\">]", "private", "<QOAuth1>", "public"] },
-  { "include": [ "@[\"<](QtNetworkAuth/)?qoauth1signature\\.h[\">]", "private", "<QOAuth1Signature>", "public"] },
-  { "include": [ "@[\"<](QtNetworkAuth/)?qoauth2authorizationcodeflow\\.h[\">]", "private", "<QOAuth2AuthorizationCodeFlow>", "public"] },
-  { "include": [ "@[\"<](QtNetworkAuth/)?qoauth2deviceauthorizationflow\\.h[\">]", "private", "<QOAuth2DeviceAuthorizationFlow>", "public"] },
-  { "include": [ "@[\"<](QtNetworkAuth/)?qoauthhttpserverreplyhandler\\.h[\">]", "private", "<QOAuthHttpServerReplyHandler>", "public"] },
-  { "include": [ "@[\"<](QtNetworkAuth/)?qoauthoobreplyhandler\\.h[\">]", "private", "<QOAuthOobReplyHandler>", "public"] },
-  { "include": [ "@[\"<](QtNetworkAuth/)?qoauthurischemereplyhandler\\.h[\">]", "private", "<QOAuthUriSchemeReplyHandler>", "public"] },
-  { "include": [ "@[\"<](QtNetworkAuth/)?qtnetworkauthversion\\.h[\">]", "private", "<QtNetworkAuthVersion>", "public"] },
-  { "include": [ "@[\"<](QtOpenGL/)?qopenglbuffer\\.h[\">]", "private", "<QOpenGLBuffer>", "public"] },
-  { "include": [ "@[\"<](QtOpenGL/)?qopenglframebufferobject\\.h[\">]", "private", "<QOpenGLFramebufferObject>", "public"] },
-  { "include": [ "@[\"<](QtOpenGL/)?qopenglfunctions_1_0\\.h[\">]", "private", "<QOpenGLFunctions_1_0>", "public"] },
-  { "include": [ "@[\"<](QtOpenGL/)?qopenglfunctions_1_1\\.h[\">]", "private", "<QOpenGLFunctions_1_1>", "public"] },
-  { "include": [ "@[\"<](QtOpenGL/)?qopenglfunctions_1_2\\.h[\">]", "private", "<QOpenGLFunctions_1_2>", "public"] },
-  { "include": [ "@[\"<](QtOpenGL/)?qopenglfunctions_1_3\\.h[\">]", "private", "<QOpenGLFunctions_1_3>", "public"] },
-  { "include": [ "@[\"<](QtOpenGL/)?qopenglfunctions_1_4\\.h[\">]", "private", "<QOpenGLFunctions_1_4>", "public"] },
-  { "include": [ "@[\"<](QtOpenGL/)?qopenglfunctions_1_5\\.h[\">]", "private", "<QOpenGLFunctions_1_5>", "public"] },
-  { "include": [ "@[\"<](QtOpenGL/)?qopenglfunctions_2_0\\.h[\">]", "private", "<QOpenGLFunctions_2_0>", "public"] },
-  { "include": [ "@[\"<](QtOpenGL/)?qopenglfunctions_2_1\\.h[\">]", "private", "<QOpenGLFunctions_2_1>", "public"] },
-  { "include": [ "@[\"<](QtOpenGL/)?qopenglfunctions_3_0\\.h[\">]", "private", "<QOpenGLFunctions_3_0>", "public"] },
-  { "include": [ "@[\"<](QtOpenGL/)?qopenglfunctions_3_1\\.h[\">]", "private", "<QOpenGLFunctions_3_1>", "public"] },
-  { "include": [ "@[\"<](QtOpenGL/)?qopenglfunctions_3_2_compatibility\\.h[\">]", "private", "<QOpenGLFunctions_3_2_Compatibility>", "public"] },
-  { "include": [ "@[\"<](QtOpenGL/)?qopenglfunctions_3_2_core\\.h[\">]", "private", "<QOpenGLFunctions_3_2_Core>", "public"] },
-  { "include": [ "@[\"<](QtOpenGL/)?qopenglfunctions_3_3_compatibility\\.h[\">]", "private", "<QOpenGLFunctions_3_3_Compatibility>", "public"] },
-  { "include": [ "@[\"<](QtOpenGL/)?qopenglfunctions_3_3_core\\.h[\">]", "private", "<QOpenGLFunctions_3_3_Core>", "public"] },
-  { "include": [ "@[\"<](QtOpenGL/)?qopenglfunctions_4_0_compatibility\\.h[\">]", "private", "<QOpenGLFunctions_4_0_Compatibility>", "public"] },
-  { "include": [ "@[\"<](QtOpenGL/)?qopenglfunctions_4_0_core\\.h[\">]", "private", "<QOpenGLFunctions_4_0_Core>", "public"] },
-  { "include": [ "@[\"<](QtOpenGL/)?qopenglfunctions_4_1_compatibility\\.h[\">]", "private", "<QOpenGLFunctions_4_1_Compatibility>", "public"] },
-  { "include": [ "@[\"<](QtOpenGL/)?qopenglfunctions_4_1_core\\.h[\">]", "private", "<QOpenGLFunctions_4_1_Core>", "public"] },
-  { "include": [ "@[\"<](QtOpenGL/)?qopenglfunctions_4_2_compatibility\\.h[\">]", "private", "<QOpenGLFunctions_4_2_Compatibility>", "public"] },
-  { "include": [ "@[\"<](QtOpenGL/)?qopenglfunctions_4_2_core\\.h[\">]", "private", "<QOpenGLFunctions_4_2_Core>", "public"] },
-  { "include": [ "@[\"<](QtOpenGL/)?qopenglfunctions_4_3_compatibility\\.h[\">]", "private", "<QOpenGLFunctions_4_3_Compatibility>", "public"] },
-  { "include": [ "@[\"<](QtOpenGL/)?qopenglfunctions_4_3_core\\.h[\">]", "private", "<QOpenGLFunctions_4_3_Core>", "public"] },
-  { "include": [ "@[\"<](QtOpenGL/)?qopenglfunctions_4_4_compatibility\\.h[\">]", "private", "<QOpenGLFunctions_4_4_Compatibility>", "public"] },
-  { "include": [ "@[\"<](QtOpenGL/)?qopenglfunctions_4_4_core\\.h[\">]", "private", "<QOpenGLFunctions_4_4_Core>", "public"] },
-  { "include": [ "@[\"<](QtOpenGL/)?qopenglfunctions_4_5_compatibility\\.h[\">]", "private", "<QOpenGLFunctions_4_5_Compatibility>", "public"] },
-  { "include": [ "@[\"<](QtOpenGL/)?qopenglfunctions_4_5_core\\.h[\">]", "private", "<QOpenGLFunctions_4_5_Core>", "public"] },
-  { "include": [ "@[\"<](QtOpenGL/)?qopenglpaintdevice\\.h[\">]", "private", "<QOpenGLPaintDevice>", "public"] },
-  { "include": [ "@[\"<](QtOpenGL/)?qopenglpixeltransferoptions\\.h[\">]", "private", "<QOpenGLPixelTransferOptions>", "public"] },
-  { "include": [ "@[\"<](QtOpenGL/)?qopenglshaderprogram\\.h[\">]", "private", "<QOpenGLShaderProgram>", "public"] },
-  { "include": [ "@[\"<](QtOpenGL/)?qopengltexture\\.h[\">]", "private", "<QOpenGLTexture>", "public"] },
-  { "include": [ "@[\"<](QtOpenGL/)?qopengltextureblitter\\.h[\">]", "private", "<QOpenGLTextureBlitter>", "public"] },
-  { "include": [ "@[\"<](QtOpenGL/)?qopengltimerquery\\.h[\">]", "private", "<QOpenGLTimerQuery>", "public"] },
-  { "include": [ "@[\"<](QtOpenGL/)?qopenglversionfunctions\\.h[\">]", "private", "<QOpenGLVersionFunctions>", "public"] },
-  { "include": [ "@[\"<](QtOpenGL/)?qopenglversionfunctionsfactory\\.h[\">]", "private", "<QOpenGLVersionFunctionsFactory>", "public"] },
-  { "include": [ "@[\"<](QtOpenGL/)?qopenglversionprofile\\.h[\">]", "private", "<QOpenGLVersionProfile>", "public"] },
-  { "include": [ "@[\"<](QtOpenGL/)?qopenglvertexarrayobject\\.h[\">]", "private", "<QOpenGLVertexArrayObject>", "public"] },
-  { "include": [ "@[\"<](QtOpenGL/)?qopenglwindow\\.h[\">]", "private", "<QOpenGLWindow>", "public"] },
-  { "include": [ "@[\"<](QtOpenGL/)?qtopenglversion\\.h[\">]", "private", "<QtOpenGLVersion>", "public"] },
-  { "include": [ "@[\"<](QtOpenGLWidgets/)?qopenglwidget\\.h[\">]", "private", "<QOpenGLWidget>", "public"] },
-  { "include": [ "@[\"<](QtOpenGLWidgets/)?qtopenglwidgetsversion\\.h[\">]", "private", "<QtOpenGLWidgetsVersion>", "public"] },
-  { "include": [ "@[\"<](QtPacketProtocol/)?qtpacketprotocolversion\\.h[\">]", "private", "<QtPacketProtocolVersion>", "public"] },
-  { "include": [ "@[\"<](QtPdf/)?qpdfbookmarkmodel\\.h[\">]", "private", "<QPdfBookmarkModel>", "public"] },
-  { "include": [ "@[\"<](QtPdf/)?qpdfdocument\\.h[\">]", "private", "<QPdfDocument>", "public"] },
-  { "include": [ "@[\"<](QtPdf/)?qpdfdocumentrenderoptions\\.h[\">]", "private", "<QPdfDocumentRenderOptions>", "public"] },
-  { "include": [ "@[\"<](QtPdf/)?qpdflink\\.h[\">]", "private", "<QPdfLink>", "public"] },
-  { "include": [ "@[\"<](QtPdf/)?qpdflinkmodel\\.h[\">]", "private", "<QPdfLinkModel>", "public"] },
-  { "include": [ "@[\"<](QtPdf/)?qpdfpagenavigator\\.h[\">]", "private", "<QPdfPageNavigator>", "public"] },
-  { "include": [ "@[\"<](QtPdf/)?qpdfpagerenderer\\.h[\">]", "private", "<QPdfPageRenderer>", "public"] },
-  { "include": [ "@[\"<](QtPdf/)?qpdfsearchmodel\\.h[\">]", "private", "<QPdfSearchModel>", "public"] },
-  { "include": [ "@[\"<](QtPdf/)?qpdfselection\\.h[\">]", "private", "<QPdfSelection>", "public"] },
-  { "include": [ "@[\"<](QtPdf/)?qtpdfversion\\.h[\">]", "private", "<QtPdfVersion>", "public"] },
-  { "include": [ "@[\"<](QtPdfQuick/)?qtpdfquickversion\\.h[\">]", "private", "<QtPdfQuickVersion>", "public"] },
-  { "include": [ "@[\"<](QtPdfWidgets/)?qpdfpageselector\\.h[\">]", "private", "<QPdfPageSelector>", "public"] },
-  { "include": [ "@[\"<](QtPdfWidgets/)?qpdfview\\.h[\">]", "private", "<QPdfView>", "public"] },
-  { "include": [ "@[\"<](QtPdfWidgets/)?qtpdfwidgetsversion\\.h[\">]", "private", "<QtPdfWidgetsVersion>", "public"] },
-  { "include": [ "@[\"<](QtPrintSupport/)?qabstractprintdialog\\.h[\">]", "private", "<QAbstractPrintDialog>", "public"] },
-  { "include": [ "@[\"<](QtPrintSupport/)?qpagesetupdialog\\.h[\">]", "private", "<QPageSetupDialog>", "public"] },
-  { "include": [ "@[\"<](QtPrintSupport/)?qprintdialog\\.h[\">]", "private", "<QPrintDialog>", "public"] },
-  { "include": [ "@[\"<](QtPrintSupport/)?qprintengine\\.h[\">]", "private", "<QPrintEngine>", "public"] },
-  { "include": [ "@[\"<](QtPrintSupport/)?qprinter\\.h[\">]", "private", "<QPrinter>", "public"] },
-  { "include": [ "@[\"<](QtPrintSupport/)?qprinterinfo\\.h[\">]", "private", "<QPrinterInfo>", "public"] },
-  { "include": [ "@[\"<](QtPrintSupport/)?qprintpreviewdialog\\.h[\">]", "private", "<QPrintPreviewDialog>", "public"] },
-  { "include": [ "@[\"<](QtPrintSupport/)?qprintpreviewwidget\\.h[\">]", "private", "<QPrintPreviewWidget>", "public"] },
-  { "include": [ "@[\"<](QtPrintSupport/)?qtprintsupportversion\\.h[\">]", "private", "<QtPrintSupportVersion>", "public"] },
-  { "include": [ "@[\"<](QtQml/)?qjsengine\\.h[\">]", "private", "<QJSEngine>", "public"] },
-  { "include": [ "@[\"<](QtQml/)?qjslist\\.h[\">]", "private", "<QJSList>", "public"] },
-  { "include": [ "@[\"<](QtQml/)?qjsmanagedvalue\\.h[\">]", "private", "<QJSManagedValue>", "public"] },
-  { "include": [ "@[\"<](QtQml/)?qjsnumbercoercion\\.h[\">]", "private", "<QJSNumberCoercion>", "public"] },
-  { "include": [ "@[\"<](QtQml/)?qjsprimitivevalue\\.h[\">]", "private", "<QJSPrimitiveValue>", "public"] },
-  { "include": [ "@[\"<](QtQml/)?qjsvalue\\.h[\">]", "private", "<QJSValue>", "public"] },
-  { "include": [ "@[\"<](QtQml/)?qjsvalueiterator\\.h[\">]", "private", "<QJSValueIterator>", "public"] },
-  { "include": [ "@[\"<](QtQml/)?qqmlabstracturlinterceptor\\.h[\">]", "private", "<QQmlAbstractUrlInterceptor>", "public"] },
-  { "include": [ "@[\"<](QtQml/)?qqmlapplicationengine\\.h[\">]", "private", "<QQmlApplicationEngine>", "public"] },
-  { "include": [ "@[\"<](QtQml/)?qqmlcomponent\\.h[\">]", "private", "<QQmlComponent>", "public"] },
-  { "include": [ "@[\"<](QtQml/)?qqmlcontext\\.h[\">]", "private", "<QQmlContext>", "public"] },
-  { "include": [ "@[\"<](QtQml/)?qqmlengine\\.h[\">]", "private", "<QQmlEngine>", "public"] },
-  { "include": [ "@[\"<](QtQml/)?qqmlerror\\.h[\">]", "private", "<QQmlError>", "public"] },
-  { "include": [ "@[\"<](QtQml/)?qqmlexpression\\.h[\">]", "private", "<QQmlExpression>", "public"] },
-  { "include": [ "@[\"<](QtQml/)?qqmlextensioninterface\\.h[\">]", "private", "<QQmlExtensionInterface>", "public"] },
-  { "include": [ "@[\"<](QtQml/)?qqmlextensionplugin\\.h[\">]", "private", "<QQmlExtensionPlugin>", "public"] },
-  { "include": [ "@[\"<](QtQml/)?qqmlfile\\.h[\">]", "private", "<QQmlFile>", "public"] },
-  { "include": [ "@[\"<](QtQml/)?qqmlfileselector\\.h[\">]", "private", "<QQmlFileSelector>", "public"] },
-  { "include": [ "@[\"<](QtQml/)?qqmlincubator\\.h[\">]", "private", "<QQmlIncubator>", "public"] },
-  { "include": [ "@[\"<](QtQml/)?qqmlinfo\\.h[\">]", "private", "<QQmlInfo>", "public"] },
-  { "include": [ "@[\"<](QtQml/)?qqmlmoduleregistration\\.h[\">]", "private", "<QQmlModuleRegistration>", "public"] },
-  { "include": [ "@[\"<](QtQml/)?qqmlnetworkaccessmanagerfactory\\.h[\">]", "private", "<QQmlNetworkAccessManagerFactory>", "public"] },
-  { "include": [ "@[\"<](QtQml/)?qqmlparserstatus\\.h[\">]", "private", "<QQmlParserStatus>", "public"] },
-  { "include": [ "@[\"<](QtQml/)?qqmlproperty\\.h[\">]", "private", "<QQmlProperty>", "public"] },
-  { "include": [ "@[\"<](QtQml/)?qqmlpropertymap\\.h[\">]", "private", "<QQmlPropertyMap>", "public"] },
-  { "include": [ "@[\"<](QtQml/)?qqmlpropertyvaluesource\\.h[\">]", "private", "<QQmlPropertyValueSource>", "public"] },
-  { "include": [ "@[\"<](QtQml/)?qqmlscriptstring\\.h[\">]", "private", "<QQmlScriptString>", "public"] },
-  { "include": [ "@[\"<](QtQml/)?qtqmlversion\\.h[\">]", "private", "<QtQmlVersion>", "public"] },
-  { "include": [ "@[\"<](QtQmlCompiler/)?qtqmlcompilerversion\\.h[\">]", "private", "<QtQmlCompilerVersion>", "public"] },
-  { "include": [ "@[\"<](QtQmlCore/)?qtqmlcoreversion\\.h[\">]", "private", "<QtQmlCoreVersion>", "public"] },
-  { "include": [ "@[\"<](QtQmlDebug/)?qtqmldebugversion\\.h[\">]", "private", "<QtQmlDebugVersion>", "public"] },
-  { "include": [ "@[\"<](QtQmlDom/)?qtqmldomversion\\.h[\">]", "private", "<QtQmlDomVersion>", "public"] },
-  { "include": [ "@[\"<](QtQmlFormat/)?qtqmlformatversion\\.h[\">]", "private", "<QtQmlFormatVersion>", "public"] },
-  { "include": [ "@[\"<](QtQmlIntegration/)?qtqmlintegrationversion\\.h[\">]", "private", "<QtQmlIntegrationVersion>", "public"] },
-  { "include": [ "@[\"<](QtQmlLocalStorage/)?qtqmllocalstorageversion\\.h[\">]", "private", "<QtQmlLocalStorageVersion>", "public"] },
-  { "include": [ "@[\"<](QtQmlMeta/)?qtqmlmetaversion\\.h[\">]", "private", "<QtQmlMetaVersion>", "public"] },
-  { "include": [ "@[\"<](QtQmlModels/)?qtqmlmodelsversion\\.h[\">]", "private", "<QtQmlModelsVersion>", "public"] },
-  { "include": [ "@[\"<](QtQmlNetwork/)?qtqmlnetworkversion\\.h[\">]", "private", "<QtQmlNetworkVersion>", "public"] },
-  { "include": [ "@[\"<](QtQmlToolingSettings/)?qtqmltoolingsettingsversion\\.h[\">]", "private", "<QtQmlToolingSettingsVersion>", "public"] },
-  { "include": [ "@[\"<](QtQmlTypeRegistrar/)?qtqmltyperegistrarversion\\.h[\">]", "private", "<QtQmlTypeRegistrarVersion>", "public"] },
-  { "include": [ "@[\"<](QtQmlWorkerScript/)?qtqmlworkerscriptversion\\.h[\">]", "private", "<QtQmlWorkerScriptVersion>", "public"] },
-  { "include": [ "@[\"<](QtQmlXmlListModel/)?qtqmlxmllistmodelversion\\.h[\">]", "private", "<QtQmlXmlListModelVersion>", "public"] },
-  { "include": [ "@[\"<](QtQmltc/)?qtqmltcversion\\.h[\">]", "private", "<QtQmltcVersion>", "public"] },
-  { "include": [ "@[\"<](QtQuick/)?qquickframebufferobject\\.h[\">]", "private", "<QQuickFramebufferObject>", "public"] },
-  { "include": [ "@[\"<](QtQuick/)?qquickgraphicsconfiguration\\.h[\">]", "private", "<QQuickGraphicsConfiguration>", "public"] },
-  { "include": [ "@[\"<](QtQuick/)?qquickgraphicsdevice\\.h[\">]", "private", "<QQuickGraphicsDevice>", "public"] },
-  { "include": [ "@[\"<](QtQuick/)?qquickimageprovider\\.h[\">]", "private", "<QQuickImageProvider>", "public"] },
-  { "include": [ "@[\"<](QtQuick/)?qquickitem\\.h[\">]", "private", "<QQuickItem>", "public"] },
-  { "include": [ "@[\"<](QtQuick/)?qquickitemgrabresult\\.h[\">]", "private", "<QQuickItemGrabResult>", "public"] },
-  { "include": [ "@[\"<](QtQuick/)?qquickopenglutils\\.h[\">]", "private", "<QQuickOpenGLUtils>", "public"] },
-  { "include": [ "@[\"<](QtQuick/)?qquickpainteditem\\.h[\">]", "private", "<QQuickPaintedItem>", "public"] },
-  { "include": [ "@[\"<](QtQuick/)?qquickrendercontrol\\.h[\">]", "private", "<QQuickRenderControl>", "public"] },
-  { "include": [ "@[\"<](QtQuick/)?qquickrendertarget\\.h[\">]", "private", "<QQuickRenderTarget>", "public"] },
-  { "include": [ "@[\"<](QtQuick/)?qquickrhiitem\\.h[\">]", "private", "<QQuickRhiItem>", "public"] },
-  { "include": [ "@[\"<](QtQuick/)?qquicktextdocument\\.h[\">]", "private", "<QQuickTextDocument>", "public"] },
-  { "include": [ "@[\"<](QtQuick/)?qquickview\\.h[\">]", "private", "<QQuickView>", "public"] },
-  { "include": [ "@[\"<](QtQuick/)?qquickwindow\\.h[\">]", "private", "<QQuickWindow>", "public"] },
-  { "include": [ "@[\"<](QtQuick/)?qsgflatcolormaterial\\.h[\">]", "private", "<QSGFlatColorMaterial>", "public"] },
-  { "include": [ "@[\"<](QtQuick/)?qsggeometry\\.h[\">]", "private", "<QSGGeometry>", "public"] },
-  { "include": [ "@[\"<](QtQuick/)?qsgimagenode\\.h[\">]", "private", "<QSGImageNode>", "public"] },
-  { "include": [ "@[\"<](QtQuick/)?qsgmaterial\\.h[\">]", "private", "<QSGMaterial>", "public"] },
-  { "include": [ "@[\"<](QtQuick/)?qsgmaterialshader\\.h[\">]", "private", "<QSGMaterialShader>", "public"] },
-  { "include": [ "@[\"<](QtQuick/)?qsgninepatchnode\\.h[\">]", "private", "<QSGNinePatchNode>", "public"] },
-  { "include": [ "@[\"<](QtQuick/)?qsgnode\\.h[\">]", "private", "<QSGNode>", "public"] },
-  { "include": [ "@[\"<](QtQuick/)?qsgrectanglenode\\.h[\">]", "private", "<QSGRectangleNode>", "public"] },
-  { "include": [ "@[\"<](QtQuick/)?qsgrendererinterface\\.h[\">]", "private", "<QSGRendererInterface>", "public"] },
-  { "include": [ "@[\"<](QtQuick/)?qsgrendernode\\.h[\">]", "private", "<QSGRenderNode>", "public"] },
-  { "include": [ "@[\"<](QtQuick/)?qsgsimplerectnode\\.h[\">]", "private", "<QSGSimpleRectNode>", "public"] },
-  { "include": [ "@[\"<](QtQuick/)?qsgsimpletexturenode\\.h[\">]", "private", "<QSGSimpleTextureNode>", "public"] },
-  { "include": [ "@[\"<](QtQuick/)?qsgtextnode\\.h[\">]", "private", "<QSGTextNode>", "public"] },
-  { "include": [ "@[\"<](QtQuick/)?qsgtexture\\.h[\">]", "private", "<QSGTexture>", "public"] },
-  { "include": [ "@[\"<](QtQuick/)?qsgtexturematerial\\.h[\">]", "private", "<QSGTextureMaterial>", "public"] },
-  { "include": [ "@[\"<](QtQuick/)?qsgtextureprovider\\.h[\">]", "private", "<QSGTextureProvider>", "public"] },
-  { "include": [ "@[\"<](QtQuick/)?qsgvertexcolormaterial\\.h[\">]", "private", "<QSGVertexColorMaterial>", "public"] },
-  { "include": [ "@[\"<](QtQuick/)?qtquickversion\\.h[\">]", "private", "<QtQuickVersion>", "public"] },
-  { "include": [ "@[\"<](QtQuick3D/)?qquick3d\\.h[\">]", "private", "<QQuick3D>", "public"] },
-  { "include": [ "@[\"<](QtQuick3D/)?qquick3dgeometry\\.h[\">]", "private", "<QQuick3DGeometry>", "public"] },
-  { "include": [ "@[\"<](QtQuick3D/)?qquick3dinstancing\\.h[\">]", "private", "<QQuick3DInstancing>", "public"] },
-  { "include": [ "@[\"<](QtQuick3D/)?qquick3dobject\\.h[\">]", "private", "<QQuick3DObject>", "public"] },
-  { "include": [ "@[\"<](QtQuick3D/)?qquick3dtexturedata\\.h[\">]", "private", "<QQuick3DTextureData>", "public"] },
-  { "include": [ "@[\"<](QtQuick3D/)?qquick3dtextureproviderextension\\.h[\">]", "private", "<QQuick3DTextureProviderExtension>", "public"] },
-  { "include": [ "@[\"<](QtQuick3D/)?qtquick3dversion\\.h[\">]", "private", "<QtQuick3DVersion>", "public"] },
-  { "include": [ "@[\"<](QtQuick3DAssetImport/)?qtquick3dassetimportversion\\.h[\">]", "private", "<QtQuick3DAssetImportVersion>", "public"] },
-  { "include": [ "@[\"<](QtQuick3DAssetUtils/)?qtquick3dassetutilsversion\\.h[\">]", "private", "<QtQuick3DAssetUtilsVersion>", "public"] },
-  { "include": [ "@[\"<](QtQuick3DGlslParser/)?qtquick3dglslparserversion\\.h[\">]", "private", "<QtQuick3DGlslParserVersion>", "public"] },
-  { "include": [ "@[\"<](QtQuick3DHelpers/)?qtquick3dhelpersversion\\.h[\">]", "private", "<QtQuick3DHelpersVersion>", "public"] },
-  { "include": [ "@[\"<](QtQuick3DHelpersImpl/)?qtquick3dhelpersimplversion\\.h[\">]", "private", "<QtQuick3DHelpersImplVersion>", "public"] },
-  { "include": [ "@[\"<](QtQuick3DIblBaker/)?qtquick3diblbakerversion\\.h[\">]", "private", "<QtQuick3DIblBakerVersion>", "public"] },
-  { "include": [ "@[\"<](QtQuick3DParticles/)?qtquick3dparticlesversion\\.h[\">]", "private", "<QtQuick3DParticlesVersion>", "public"] },
-  { "include": [ "@[\"<](QtQuick3DRuntimeRender/)?qtquick3druntimerenderversion\\.h[\">]", "private", "<QtQuick3DRuntimeRenderVersion>", "public"] },
-  { "include": [ "@[\"<](QtQuick3DSpatialAudio/)?qtquick3dspatialaudioversion\\.h[\">]", "private", "<QtQuick3DSpatialAudioVersion>", "public"] },
-  { "include": [ "@[\"<](QtQuick3DUtils/)?qtquick3dutilsversion\\.h[\">]", "private", "<QtQuick3DUtilsVersion>", "public"] },
-  { "include": [ "@[\"<](QtQuickControls2/)?qquickattachedpropertypropagator\\.h[\">]", "private", "<QQuickAttachedPropertyPropagator>", "public"] },
-  { "include": [ "@[\"<](QtQuickControls2/)?qquickstyle\\.h[\">]", "private", "<QQuickStyle>", "public"] },
-  { "include": [ "@[\"<](QtQuickControls2/)?qtquickcontrols2version\\.h[\">]", "private", "<QtQuickControls2Version>", "public"] },
-  { "include": [ "@[\"<](QtQuickControls2Basic/)?qtquickcontrols2basicversion\\.h[\">]", "private", "<QtQuickControls2BasicVersion>", "public"] },
-  { "include": [ "@[\"<](QtQuickControls2BasicStyleImpl/)?qtquickcontrols2basicstyleimplversion\\.h[\">]", "private", "<QtQuickControls2BasicStyleImplVersion>", "public"] },
-  { "include": [ "@[\"<](QtQuickControls2FluentWinUI3StyleImpl/)?qtquickcontrols2fluentwinui3styleimplversion\\.h[\">]", "private", "<QtQuickControls2FluentWinUI3StyleImplVersion>", "public"] },
-  { "include": [ "@[\"<](QtQuickControls2Fusion/)?qtquickcontrols2fusionversion\\.h[\">]", "private", "<QtQuickControls2FusionVersion>", "public"] },
-  { "include": [ "@[\"<](QtQuickControls2FusionStyleImpl/)?qtquickcontrols2fusionstyleimplversion\\.h[\">]", "private", "<QtQuickControls2FusionStyleImplVersion>", "public"] },
-  { "include": [ "@[\"<](QtQuickControls2Imagine/)?qtquickcontrols2imagineversion\\.h[\">]", "private", "<QtQuickControls2ImagineVersion>", "public"] },
-  { "include": [ "@[\"<](QtQuickControls2ImagineStyleImpl/)?qtquickcontrols2imaginestyleimplversion\\.h[\">]", "private", "<QtQuickControls2ImagineStyleImplVersion>", "public"] },
-  { "include": [ "@[\"<](QtQuickControls2Impl/)?qtquickcontrols2implversion\\.h[\">]", "private", "<QtQuickControls2ImplVersion>", "public"] },
-  { "include": [ "@[\"<](QtQuickControls2Material/)?qtquickcontrols2materialversion\\.h[\">]", "private", "<QtQuickControls2MaterialVersion>", "public"] },
-  { "include": [ "@[\"<](QtQuickControls2MaterialStyleImpl/)?qtquickcontrols2materialstyleimplversion\\.h[\">]", "private", "<QtQuickControls2MaterialStyleImplVersion>", "public"] },
-  { "include": [ "@[\"<](QtQuickControls2Universal/)?qtquickcontrols2universalversion\\.h[\">]", "private", "<QtQuickControls2UniversalVersion>", "public"] },
-  { "include": [ "@[\"<](QtQuickControls2UniversalStyleImpl/)?qtquickcontrols2universalstyleimplversion\\.h[\">]", "private", "<QtQuickControls2UniversalStyleImplVersion>", "public"] },
-  { "include": [ "@[\"<](QtQuickControlsTestUtils/)?qtquickcontrolstestutilsversion\\.h[\">]", "private", "<QtQuickControlsTestUtilsVersion>", "public"] },
-  { "include": [ "@[\"<](QtQuickDialogs2/)?qtquickdialogs2version\\.h[\">]", "private", "<QtQuickDialogs2Version>", "public"] },
-  { "include": [ "@[\"<](QtQuickDialogs2QuickImpl/)?qtquickdialogs2quickimplversion\\.h[\">]", "private", "<QtQuickDialogs2QuickImplVersion>", "public"] },
-  { "include": [ "@[\"<](QtQuickDialogs2Utils/)?qtquickdialogs2utilsversion\\.h[\">]", "private", "<QtQuickDialogs2UtilsVersion>", "public"] },
-  { "include": [ "@[\"<](QtQuickEffects/)?qtquickeffectsversion\\.h[\">]", "private", "<QtQuickEffectsVersion>", "public"] },
-  { "include": [ "@[\"<](QtQuickLayouts/)?qtquicklayoutsversion\\.h[\">]", "private", "<QtQuickLayoutsVersion>", "public"] },
-  { "include": [ "@[\"<](QtQuickParticles/)?qtquickparticlesversion\\.h[\">]", "private", "<QtQuickParticlesVersion>", "public"] },
-  { "include": [ "@[\"<](QtQuickShapes/)?qtquickshapesversion\\.h[\">]", "private", "<QtQuickShapesVersion>", "public"] },
-  { "include": [ "@[\"<](QtQuickShapesDesignHelpers/)?qtquickshapesdesignhelpersversion\\.h[\">]", "private", "<QtQuickShapesDesignHelpersVersion>", "public"] },
-  { "include": [ "@[\"<](QtQuickTemplates2/)?qtquicktemplates2version\\.h[\">]", "private", "<QtQuickTemplates2Version>", "public"] },
-  { "include": [ "@[\"<](QtQuickTest/)?qtquicktestversion\\.h[\">]", "private", "<QtQuickTestVersion>", "public"] },
-  { "include": [ "@[\"<](QtQuickTestUtils/)?qtquicktestutilsversion\\.h[\">]", "private", "<QtQuickTestUtilsVersion>", "public"] },
-  { "include": [ "@[\"<](QtQuickTimeline/)?qtquicktimelineversion\\.h[\">]", "private", "<QtQuickTimelineVersion>", "public"] },
-  { "include": [ "@[\"<](QtQuickTimelineBlendTrees/)?qtquicktimelineblendtreesversion\\.h[\">]", "private", "<QtQuickTimelineBlendTreesVersion>", "public"] },
-  { "include": [ "@[\"<](QtQuickVectorImage/)?qtquickvectorimageversion\\.h[\">]", "private", "<QtQuickVectorImageVersion>", "public"] },
-  { "include": [ "@[\"<](QtQuickVectorImageGenerator/)?qtquickvectorimagegeneratorversion\\.h[\">]", "private", "<QtQuickVectorImageGeneratorVersion>", "public"] },
-  { "include": [ "@[\"<](QtQuickVectorImageHelpers/)?qtquickvectorimagehelpersversion\\.h[\">]", "private", "<QtQuickVectorImageHelpersVersion>", "public"] },
-  { "include": [ "@[\"<](QtQuickWidgets/)?qquickwidget\\.h[\">]", "private", "<QQuickWidget>", "public"] },
-  { "include": [ "@[\"<](QtQuickWidgets/)?qtquickwidgetsversion\\.h[\">]", "private", "<QtQuickWidgetsVersion>", "public"] },
-  { "include": [ "@[\"<](QtScxml/)?qscxmlcompiler\\.h[\">]", "private", "<QScxmlCompiler>", "public"] },
-  { "include": [ "@[\"<](QtScxml/)?qscxmlcppdatamodel\\.h[\">]", "private", "<QScxmlCppDataModel>", "public"] },
-  { "include": [ "@[\"<](QtScxml/)?qscxmldatamodel\\.h[\">]", "private", "<QScxmlDataModel>", "public"] },
-  { "include": [ "@[\"<](QtScxml/)?qscxmlerror\\.h[\">]", "private", "<QScxmlError>", "public"] },
-  { "include": [ "@[\"<](QtScxml/)?qscxmlevent\\.h[\">]", "private", "<QScxmlEvent>", "public"] },
-  { "include": [ "@[\"<](QtScxml/)?qscxmlinvokableservice\\.h[\">]", "private", "<QScxmlInvokableService>", "public"] },
-  { "include": [ "@[\"<](QtScxml/)?qscxmlnulldatamodel\\.h[\">]", "private", "<QScxmlNullDataModel>", "public"] },
-  { "include": [ "@[\"<](QtScxml/)?qscxmlstatemachine\\.h[\">]", "private", "<QScxmlStateMachine>", "public"] },
-  { "include": [ "@[\"<](QtScxml/)?qscxmltabledata\\.h[\">]", "private", "<QScxmlTableData>", "public"] },
-  { "include": [ "@[\"<](QtScxml/)?qtscxmlversion\\.h[\">]", "private", "<QtScxmlVersion>", "public"] },
-  { "include": [ "@[\"<](QtScxmlGlobal/)?qtscxmlglobalversion\\.h[\">]", "private", "<QtScxmlGlobalVersion>", "public"] },
-  { "include": [ "@[\"<](QtScxmlQml/)?qtscxmlqmlversion\\.h[\">]", "private", "<QtScxmlQmlVersion>", "public"] },
-  { "include": [ "@[\"<](QtShaderTools/)?qtshadertoolsversion\\.h[\">]", "private", "<QtShaderToolsVersion>", "public"] },
-  { "include": [ "@[\"<](QtSpatialAudio/)?qambientsound\\.h[\">]", "private", "<QAmbientSound>", "public"] },
-  { "include": [ "@[\"<](QtSpatialAudio/)?qaudioengine\\.h[\">]", "private", "<QAudioEngine>", "public"] },
-  { "include": [ "@[\"<](QtSpatialAudio/)?qaudiolistener\\.h[\">]", "private", "<QAudioListener>", "public"] },
-  { "include": [ "@[\"<](QtSpatialAudio/)?qaudioroom\\.h[\">]", "private", "<QAudioRoom>", "public"] },
-  { "include": [ "@[\"<](QtSpatialAudio/)?qspatialsound\\.h[\">]", "private", "<QSpatialSound>", "public"] },
-  { "include": [ "@[\"<](QtSpatialAudio/)?qtspatialaudioversion\\.h[\">]", "private", "<QtSpatialAudioVersion>", "public"] },
-  { "include": [ "@[\"<](QtSql/)?qsqldatabase\\.h[\">]", "private", "<QSqlDatabase>", "public"] },
-  { "include": [ "@[\"<](QtSql/)?qsqldriver\\.h[\">]", "private", "<QSqlDriver>", "public"] },
-  { "include": [ "@[\"<](QtSql/)?qsqldriverplugin\\.h[\">]", "private", "<QSqlDriverPlugin>", "public"] },
-  { "include": [ "@[\"<](QtSql/)?qsqlerror\\.h[\">]", "private", "<QSqlError>", "public"] },
-  { "include": [ "@[\"<](QtSql/)?qsqlfield\\.h[\">]", "private", "<QSqlField>", "public"] },
-  { "include": [ "@[\"<](QtSql/)?qsqlindex\\.h[\">]", "private", "<QSqlIndex>", "public"] },
-  { "include": [ "@[\"<](QtSql/)?qsqlquery\\.h[\">]", "private", "<QSqlQuery>", "public"] },
-  { "include": [ "@[\"<](QtSql/)?qsqlquerymodel\\.h[\">]", "private", "<QSqlQueryModel>", "public"] },
-  { "include": [ "@[\"<](QtSql/)?qsqlrecord\\.h[\">]", "private", "<QSqlRecord>", "public"] },
-  { "include": [ "@[\"<](QtSql/)?qsqlrelationaldelegate\\.h[\">]", "private", "<QSqlRelationalDelegate>", "public"] },
-  { "include": [ "@[\"<](QtSql/)?qsqlrelationaltablemodel\\.h[\">]", "private", "<QSqlRelationalTableModel>", "public"] },
-  { "include": [ "@[\"<](QtSql/)?qsqlresult\\.h[\">]", "private", "<QSqlResult>", "public"] },
-  { "include": [ "@[\"<](QtSql/)?qsqltablemodel\\.h[\">]", "private", "<QSqlTableModel>", "public"] },
-  { "include": [ "@[\"<](QtSql/)?qtsqlversion\\.h[\">]", "private", "<QtSqlVersion>", "public"] },
-  { "include": [ "@[\"<](QtStateMachine/)?qabstractstate\\.h[\">]", "private", "<QAbstractState>", "public"] },
-  { "include": [ "@[\"<](QtStateMachine/)?qabstracttransition\\.h[\">]", "private", "<QAbstractTransition>", "public"] },
-  { "include": [ "@[\"<](QtStateMachine/)?qeventtransition\\.h[\">]", "private", "<QEventTransition>", "public"] },
-  { "include": [ "@[\"<](QtStateMachine/)?qfinalstate\\.h[\">]", "private", "<QFinalState>", "public"] },
-  { "include": [ "@[\"<](QtStateMachine/)?qhistorystate\\.h[\">]", "private", "<QHistoryState>", "public"] },
-  { "include": [ "@[\"<](QtStateMachine/)?qkeyeventtransition\\.h[\">]", "private", "<QKeyEventTransition>", "public"] },
-  { "include": [ "@[\"<](QtStateMachine/)?qmouseeventtransition\\.h[\">]", "private", "<QMouseEventTransition>", "public"] },
-  { "include": [ "@[\"<](QtStateMachine/)?qsignaltransition\\.h[\">]", "private", "<QSignalTransition>", "public"] },
-  { "include": [ "@[\"<](QtStateMachine/)?qstate\\.h[\">]", "private", "<QState>", "public"] },
-  { "include": [ "@[\"<](QtStateMachine/)?qstatemachine\\.h[\">]", "private", "<QStateMachine>", "public"] },
-  { "include": [ "@[\"<](QtStateMachine/)?qtstatemachineversion\\.h[\">]", "private", "<QtStateMachineVersion>", "public"] },
-  { "include": [ "@[\"<](QtStateMachineQml/)?qtstatemachineqmlversion\\.h[\">]", "private", "<QtStateMachineQmlVersion>", "public"] },
-  { "include": [ "@[\"<](QtSvg/)?qsvggenerator\\.h[\">]", "private", "<QSvgGenerator>", "public"] },
-  { "include": [ "@[\"<](QtSvg/)?qsvgrenderer\\.h[\">]", "private", "<QSvgRenderer>", "public"] },
-  { "include": [ "@[\"<](QtSvg/)?qtsvgversion\\.h[\">]", "private", "<QtSvgVersion>", "public"] },
-  { "include": [ "@[\"<](QtSvgWidgets/)?qgraphicssvgitem\\.h[\">]", "private", "<QGraphicsSvgItem>", "public"] },
-  { "include": [ "@[\"<](QtSvgWidgets/)?qsvgwidget\\.h[\">]", "private", "<QSvgWidget>", "public"] },
-  { "include": [ "@[\"<](QtSvgWidgets/)?qtsvgwidgetsversion\\.h[\">]", "private", "<QtSvgWidgetsVersion>", "public"] },
-  { "include": [ "@[\"<](QtTest/)?qabstractitemmodeltester\\.h[\">]", "private", "<QAbstractItemModelTester>", "public"] },
-  { "include": [ "@[\"<](QtTest/)?qsignalspy\\.h[\">]", "private", "<QSignalSpy>", "public"] },
-  { "include": [ "@[\"<](QtTest/)?qtest\\.h[\">]", "private", "<QTest>", "public"] },
-  { "include": [ "@[\"<](QtTest/)?qtestdata\\.h[\">]", "private", "<QTestData>", "public"] },
-  { "include": [ "@[\"<](QtTest/)?qtestevent\\.h[\">]", "private", "<QTestEvent>", "public"] },
-  { "include": [ "@[\"<](QtTest/)?qtesteventloop\\.h[\">]", "private", "<QTestEventLoop>", "public"] },
-  { "include": [ "@[\"<](QtTest/)?qttestversion\\.h[\">]", "private", "<QtTestVersion>", "public"] },
-  { "include": [ "@[\"<](QtTools/)?qttoolsversion\\.h[\">]", "private", "<QtToolsVersion>", "public"] },
-  { "include": [ "@[\"<](QtUiPlugin/)?qdesignerexportwidget\\.h[\">]", "private", "<QDesignerExportWidget>", "public"] },
-  { "include": [ "@[\"<](QtUiPlugin/)?qtuipluginversion\\.h[\">]", "private", "<QtUiPluginVersion>", "public"] },
-  { "include": [ "@[\"<](QtUiTools/)?qtuitoolsversion\\.h[\">]", "private", "<QtUiToolsVersion>", "public"] },
-  { "include": [ "@[\"<](QtUiTools/)?quiloader\\.h[\">]", "private", "<QUiLoader>", "public"] },
-  { "include": [ "@[\"<](QtWaylandClient/)?qtwaylandclientversion\\.h[\">]", "private", "<QtWaylandClientVersion>", "public"] },
-  { "include": [ "@[\"<](QtWaylandClient/)?qwaylandclientextension\\.h[\">]", "private", "<QWaylandClientExtension>", "public"] },
-  { "include": [ "@[\"<](QtWaylandCompositor/)?qtwaylandcompositorversion\\.h[\">]", "private", "<QtWaylandCompositorVersion>", "public"] },
-  { "include": [ "@[\"<](QtWaylandCompositor/)?qwaylandbufferref\\.h[\">]", "private", "<QWaylandBufferRef>", "public"] },
-  { "include": [ "@[\"<](QtWaylandCompositor/)?qwaylandclient\\.h[\">]", "private", "<QWaylandClient>", "public"] },
-  { "include": [ "@[\"<](QtWaylandCompositor/)?qwaylandcompositor\\.h[\">]", "private", "<QWaylandCompositor>", "public"] },
-  { "include": [ "@[\"<](QtWaylandCompositor/)?qwaylandcompositorextension\\.h[\">]", "private", "<QWaylandCompositorExtension>", "public"] },
-  { "include": [ "@[\"<](QtWaylandCompositor/)?qwaylanddestroylistener\\.h[\">]", "private", "<QWaylandDestroyListener>", "public"] },
-  { "include": [ "@[\"<](QtWaylandCompositor/)?qwaylanddrag\\.h[\">]", "private", "<QWaylandDrag>", "public"] },
-  { "include": [ "@[\"<](QtWaylandCompositor/)?qwaylandinputmethodcontrol\\.h[\">]", "private", "<QWaylandInputMethodControl>", "public"] },
-  { "include": [ "@[\"<](QtWaylandCompositor/)?qwaylandiviapplication\\.h[\">]", "private", "<QWaylandIviApplication>", "public"] },
-  { "include": [ "@[\"<](QtWaylandCompositor/)?qwaylandivisurface\\.h[\">]", "private", "<QWaylandIviSurface>", "public"] },
-  { "include": [ "@[\"<](QtWaylandCompositor/)?qwaylandkeyboard\\.h[\">]", "private", "<QWaylandKeyboard>", "public"] },
-  { "include": [ "@[\"<](QtWaylandCompositor/)?qwaylandkeymap\\.h[\">]", "private", "<QWaylandKeymap>", "public"] },
-  { "include": [ "@[\"<](QtWaylandCompositor/)?qwaylandoutput\\.h[\">]", "private", "<QWaylandOutput>", "public"] },
-  { "include": [ "@[\"<](QtWaylandCompositor/)?qwaylandoutputmode\\.h[\">]", "private", "<QWaylandOutputMode>", "public"] },
-  { "include": [ "@[\"<](QtWaylandCompositor/)?qwaylandpointer\\.h[\">]", "private", "<QWaylandPointer>", "public"] },
-  { "include": [ "@[\"<](QtWaylandCompositor/)?qwaylandqttextinputmethod\\.h[\">]", "private", "<QWaylandQtTextInputMethod>", "public"] },
-  { "include": [ "@[\"<](QtWaylandCompositor/)?qwaylandqttextinputmethodmanager\\.h[\">]", "private", "<QWaylandQtTextInputMethodManager>", "public"] },
-  { "include": [ "@[\"<](QtWaylandCompositor/)?qwaylandqtwindowmanager\\.h[\">]", "private", "<QWaylandQtWindowManager>", "public"] },
-  { "include": [ "@[\"<](QtWaylandCompositor/)?qwaylandquickcompositor\\.h[\">]", "private", "<QWaylandQuickCompositor>", "public"] },
-  { "include": [ "@[\"<](QtWaylandCompositor/)?qwaylandquickextension\\.h[\">]", "private", "<QWaylandQuickExtension>", "public"] },
-  { "include": [ "@[\"<](QtWaylandCompositor/)?qwaylandquickitem\\.h[\">]", "private", "<QWaylandQuickItem>", "public"] },
-  { "include": [ "@[\"<](QtWaylandCompositor/)?qwaylandquickoutput\\.h[\">]", "private", "<QWaylandQuickOutput>", "public"] },
-  { "include": [ "@[\"<](QtWaylandCompositor/)?qwaylandquickshellintegration\\.h[\">]", "private", "<QWaylandQuickShellIntegration>", "public"] },
-  { "include": [ "@[\"<](QtWaylandCompositor/)?qwaylandquickshellsurfaceitem\\.h[\">]", "private", "<QWaylandQuickShellSurfaceItem>", "public"] },
-  { "include": [ "@[\"<](QtWaylandCompositor/)?qwaylandquicksurface\\.h[\">]", "private", "<QWaylandQuickSurface>", "public"] },
-  { "include": [ "@[\"<](QtWaylandCompositor/)?qwaylandquickxdgoutputv1\\.h[\">]", "private", "<QWaylandQuickXdgOutputV1>", "public"] },
-  { "include": [ "@[\"<](QtWaylandCompositor/)?qwaylandresource\\.h[\">]", "private", "<QWaylandResource>", "public"] },
-  { "include": [ "@[\"<](QtWaylandCompositor/)?qwaylandseat\\.h[\">]", "private", "<QWaylandSeat>", "public"] },
-  { "include": [ "@[\"<](QtWaylandCompositor/)?qwaylandshell\\.h[\">]", "private", "<QWaylandShell>", "public"] },
-  { "include": [ "@[\"<](QtWaylandCompositor/)?qwaylandshellsurface\\.h[\">]", "private", "<QWaylandShellSurface>", "public"] },
-  { "include": [ "@[\"<](QtWaylandCompositor/)?qwaylandsurface\\.h[\">]", "private", "<QWaylandSurface>", "public"] },
-  { "include": [ "@[\"<](QtWaylandCompositor/)?qwaylandsurfacegrabber\\.h[\">]", "private", "<QWaylandSurfaceGrabber>", "public"] },
-  { "include": [ "@[\"<](QtWaylandCompositor/)?qwaylandtextinput\\.h[\">]", "private", "<QWaylandTextInput>", "public"] },
-  { "include": [ "@[\"<](QtWaylandCompositor/)?qwaylandtextinputmanager\\.h[\">]", "private", "<QWaylandTextInputManager>", "public"] },
-  { "include": [ "@[\"<](QtWaylandCompositor/)?qwaylandtextinputmanagerv3\\.h[\">]", "private", "<QWaylandTextInputManagerV3>", "public"] },
-  { "include": [ "@[\"<](QtWaylandCompositor/)?qwaylandtextinputv3\\.h[\">]", "private", "<QWaylandTextInputV3>", "public"] },
-  { "include": [ "@[\"<](QtWaylandCompositor/)?qwaylandtouch\\.h[\">]", "private", "<QWaylandTouch>", "public"] },
-  { "include": [ "@[\"<](QtWaylandCompositor/)?qwaylandview\\.h[\">]", "private", "<QWaylandView>", "public"] },
-  { "include": [ "@[\"<](QtWaylandCompositor/)?qwaylandviewporter\\.h[\">]", "private", "<QWaylandViewporter>", "public"] },
-  { "include": [ "@[\"<](QtWaylandCompositor/)?qwaylandwlshell\\.h[\">]", "private", "<QWaylandWlShell>", "public"] },
-  { "include": [ "@[\"<](QtWaylandCompositor/)?qwaylandxdgoutputv1\\.h[\">]", "private", "<QWaylandXdgOutputV1>", "public"] },
-  { "include": [ "@[\"<](QtWaylandCompositor/)?qwaylandxdgshell\\.h[\">]", "private", "<QWaylandXdgShell>", "public"] },
-  { "include": [ "@[\"<](QtWaylandCompositorIviapplication/)?qtwaylandcompositoriviapplicationversion\\.h[\">]", "private", "<QtWaylandCompositorIviapplicationVersion>", "public"] },
-  { "include": [ "@[\"<](QtWaylandCompositorPresentationTime/)?qtwaylandcompositorpresentationtimeversion\\.h[\">]", "private", "<QtWaylandCompositorPresentationTimeVersion>", "public"] },
-  { "include": [ "@[\"<](QtWaylandCompositorWLShell/)?qtwaylandcompositorwlshellversion\\.h[\">]", "private", "<QtWaylandCompositorWLShellVersion>", "public"] },
-  { "include": [ "@[\"<](QtWaylandCompositorXdgShell/)?qtwaylandcompositorxdgshellversion\\.h[\">]", "private", "<QtWaylandCompositorXdgShellVersion>", "public"] },
-  { "include": [ "@[\"<](QtWaylandEglCompositorHwIntegration/)?qtwaylandeglcompositorhwintegrationversion\\.h[\">]", "private", "<QtWaylandEglCompositorHwIntegrationVersion>", "public"] },
-  { "include": [ "@[\"<](QtWaylandGlobal/)?qtwaylandglobalversion\\.h[\">]", "private", "<QtWaylandGlobalVersion>", "public"] },
-  { "include": [ "@[\"<](QtWebChannel/)?qtwebchannelversion\\.h[\">]", "private", "<QtWebChannelVersion>", "public"] },
-  { "include": [ "@[\"<](QtWebChannel/)?qwebchannel\\.h[\">]", "private", "<QWebChannel>", "public"] },
-  { "include": [ "@[\"<](QtWebChannel/)?qwebchannelabstracttransport\\.h[\">]", "private", "<QWebChannelAbstractTransport>", "public"] },
-  { "include": [ "@[\"<](QtWebChannelQuick/)?qqmlwebchannel\\.h[\">]", "private", "<QQmlWebChannel>", "public"] },
-  { "include": [ "@[\"<](QtWebChannelQuick/)?qtwebchannelquickversion\\.h[\">]", "private", "<QtWebChannelQuickVersion>", "public"] },
-  { "include": [ "@[\"<](QtWebEngineCore/)?qtwebenginecoreversion\\.h[\">]", "private", "<QtWebEngineCoreVersion>", "public"] },
-  { "include": [ "@[\"<](QtWebEngineCore/)?qwebenginecertificateerror\\.h[\">]", "private", "<QWebEngineCertificateError>", "public"] },
-  { "include": [ "@[\"<](QtWebEngineCore/)?qwebengineclientcertificateselection\\.h[\">]", "private", "<QWebEngineClientCertificateSelection>", "public"] },
-  { "include": [ "@[\"<](QtWebEngineCore/)?qwebengineclientcertificatestore\\.h[\">]", "private", "<QWebEngineClientCertificateStore>", "public"] },
-  { "include": [ "@[\"<](QtWebEngineCore/)?qwebengineclienthints\\.h[\">]", "private", "<QWebEngineClientHints>", "public"] },
-  { "include": [ "@[\"<](QtWebEngineCore/)?qwebenginecontextmenurequest\\.h[\">]", "private", "<QWebEngineContextMenuRequest>", "public"] },
-  { "include": [ "@[\"<](QtWebEngineCore/)?qwebenginecookiestore\\.h[\">]", "private", "<QWebEngineCookieStore>", "public"] },
-  { "include": [ "@[\"<](QtWebEngineCore/)?qwebenginedesktopmediarequest\\.h[\">]", "private", "<QWebEngineDesktopMediaRequest>", "public"] },
-  { "include": [ "@[\"<](QtWebEngineCore/)?qwebenginedownloadrequest\\.h[\">]", "private", "<QWebEngineDownloadRequest>", "public"] },
-  { "include": [ "@[\"<](QtWebEngineCore/)?qwebengineextensioninfo\\.h[\">]", "private", "<QWebEngineExtensionInfo>", "public"] },
-  { "include": [ "@[\"<](QtWebEngineCore/)?qwebengineextensionmanager\\.h[\">]", "private", "<QWebEngineExtensionManager>", "public"] },
-  { "include": [ "@[\"<](QtWebEngineCore/)?qwebenginefilesystemaccessrequest\\.h[\">]", "private", "<QWebEngineFileSystemAccessRequest>", "public"] },
-  { "include": [ "@[\"<](QtWebEngineCore/)?qwebenginefindtextresult\\.h[\">]", "private", "<QWebEngineFindTextResult>", "public"] },
-  { "include": [ "@[\"<](QtWebEngineCore/)?qwebengineframe\\.h[\">]", "private", "<QWebEngineFrame>", "public"] },
-  { "include": [ "@[\"<](QtWebEngineCore/)?qwebenginefullscreenrequest\\.h[\">]", "private", "<QWebEngineFullScreenRequest>", "public"] },
-  { "include": [ "@[\"<](QtWebEngineCore/)?qwebengineglobalsettings\\.h[\">]", "private", "<QWebEngineGlobalSettings>", "public"] },
-  { "include": [ "@[\"<](QtWebEngineCore/)?qwebenginehistory\\.h[\">]", "private", "<QWebEngineHistory>", "public"] },
-  { "include": [ "@[\"<](QtWebEngineCore/)?qwebenginehttprequest\\.h[\">]", "private", "<QWebEngineHttpRequest>", "public"] },
-  { "include": [ "@[\"<](QtWebEngineCore/)?qwebengineloadinginfo\\.h[\">]", "private", "<QWebEngineLoadingInfo>", "public"] },
-  { "include": [ "@[\"<](QtWebEngineCore/)?qwebenginenavigationrequest\\.h[\">]", "private", "<QWebEngineNavigationRequest>", "public"] },
-  { "include": [ "@[\"<](QtWebEngineCore/)?qwebenginenewwindowrequest\\.h[\">]", "private", "<QWebEngineNewWindowRequest>", "public"] },
-  { "include": [ "@[\"<](QtWebEngineCore/)?qwebenginenotification\\.h[\">]", "private", "<QWebEngineNotification>", "public"] },
-  { "include": [ "@[\"<](QtWebEngineCore/)?qwebenginepage\\.h[\">]", "private", "<QWebEnginePage>", "public"] },
-  { "include": [ "@[\"<](QtWebEngineCore/)?qwebenginepermission\\.h[\">]", "private", "<QWebEnginePermission>", "public"] },
-  { "include": [ "@[\"<](QtWebEngineCore/)?qwebengineprofile\\.h[\">]", "private", "<QWebEngineProfile>", "public"] },
-  { "include": [ "@[\"<](QtWebEngineCore/)?qwebengineprofilebuilder\\.h[\">]", "private", "<QWebEngineProfileBuilder>", "public"] },
-  { "include": [ "@[\"<](QtWebEngineCore/)?qwebenginequotarequest\\.h[\">]", "private", "<QWebEngineQuotaRequest>", "public"] },
-  { "include": [ "@[\"<](QtWebEngineCore/)?qwebengineregisterprotocolhandlerrequest\\.h[\">]", "private", "<QWebEngineRegisterProtocolHandlerRequest>", "public"] },
-  { "include": [ "@[\"<](QtWebEngineCore/)?qwebenginescript\\.h[\">]", "private", "<QWebEngineScript>", "public"] },
-  { "include": [ "@[\"<](QtWebEngineCore/)?qwebenginescriptcollection\\.h[\">]", "private", "<QWebEngineScriptCollection>", "public"] },
-  { "include": [ "@[\"<](QtWebEngineCore/)?qwebenginesettings\\.h[\">]", "private", "<QWebEngineSettings>", "public"] },
-  { "include": [ "@[\"<](QtWebEngineCore/)?qwebengineurlrequestinfo\\.h[\">]", "private", "<QWebEngineUrlRequestInfo>", "public"] },
-  { "include": [ "@[\"<](QtWebEngineCore/)?qwebengineurlrequestinterceptor\\.h[\">]", "private", "<QWebEngineUrlRequestInterceptor>", "public"] },
-  { "include": [ "@[\"<](QtWebEngineCore/)?qwebengineurlrequestjob\\.h[\">]", "private", "<QWebEngineUrlRequestJob>", "public"] },
-  { "include": [ "@[\"<](QtWebEngineCore/)?qwebengineurlscheme\\.h[\">]", "private", "<QWebEngineUrlScheme>", "public"] },
-  { "include": [ "@[\"<](QtWebEngineCore/)?qwebengineurlschemehandler\\.h[\">]", "private", "<QWebEngineUrlSchemeHandler>", "public"] },
-  { "include": [ "@[\"<](QtWebEngineCore/)?qwebenginewebauthuxrequest\\.h[\">]", "private", "<QWebEngineWebAuthUxRequest>", "public"] },
-  { "include": [ "@[\"<](QtWebEngineQuick/)?qquickwebenginedownloadrequest\\.h[\">]", "private", "<QQuickWebEngineDownloadRequest>", "public"] },
-  { "include": [ "@[\"<](QtWebEngineQuick/)?qquickwebengineprofile\\.h[\">]", "private", "<QQuickWebEngineProfile>", "public"] },
-  { "include": [ "@[\"<](QtWebEngineQuick/)?qtwebenginequickversion\\.h[\">]", "private", "<QtWebEngineQuickVersion>", "public"] },
-  { "include": [ "@[\"<](QtWebEngineWidgets/)?qtwebenginewidgetsversion\\.h[\">]", "private", "<QtWebEngineWidgetsVersion>", "public"] },
-  { "include": [ "@[\"<](QtWebEngineWidgets/)?qwebengineview\\.h[\">]", "private", "<QWebEngineView>", "public"] },
-  { "include": [ "@[\"<](QtWebSockets/)?qmaskgenerator\\.h[\">]", "private", "<QMaskGenerator>", "public"] },
-  { "include": [ "@[\"<](QtWebSockets/)?qtwebsocketsversion\\.h[\">]", "private", "<QtWebSocketsVersion>", "public"] },
-  { "include": [ "@[\"<](QtWebSockets/)?qwebsocket\\.h[\">]", "private", "<QWebSocket>", "public"] },
-  { "include": [ "@[\"<](QtWebSockets/)?qwebsocketcorsauthenticator\\.h[\">]", "private", "<QWebSocketCorsAuthenticator>", "public"] },
-  { "include": [ "@[\"<](QtWebSockets/)?qwebsockethandshakeoptions\\.h[\">]", "private", "<QWebSocketHandshakeOptions>", "public"] },
-  { "include": [ "@[\"<](QtWebSockets/)?qwebsocketprotocol\\.h[\">]", "private", "<QWebSocketProtocol>", "public"] },
-  { "include": [ "@[\"<](QtWebSockets/)?qwebsocketserver\\.h[\">]", "private", "<QWebSocketServer>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qabstractbutton\\.h[\">]", "private", "<QAbstractButton>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qabstractitemdelegate\\.h[\">]", "private", "<QAbstractItemDelegate>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qabstractitemview\\.h[\">]", "private", "<QAbstractItemView>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qabstractscrollarea\\.h[\">]", "private", "<QAbstractScrollArea>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qabstractslider\\.h[\">]", "private", "<QAbstractSlider>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qabstractspinbox\\.h[\">]", "private", "<QAbstractSpinBox>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qaccessiblewidget\\.h[\">]", "private", "<QAccessibleWidget>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qapplication\\.h[\">]", "private", "<QApplication>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qboxlayout\\.h[\">]", "private", "<QBoxLayout>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qbuttongroup\\.h[\">]", "private", "<QButtonGroup>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qcalendarwidget\\.h[\">]", "private", "<QCalendarWidget>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qcheckbox\\.h[\">]", "private", "<QCheckBox>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qcolordialog\\.h[\">]", "private", "<QColorDialog>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qcolormap\\.h[\">]", "private", "<QColormap>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qcolumnview\\.h[\">]", "private", "<QColumnView>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qcombobox\\.h[\">]", "private", "<QComboBox>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qcommandlinkbutton\\.h[\">]", "private", "<QCommandLinkButton>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qcommonstyle\\.h[\">]", "private", "<QCommonStyle>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qcompleter\\.h[\">]", "private", "<QCompleter>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qdatawidgetmapper\\.h[\">]", "private", "<QDataWidgetMapper>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qdatetimeedit\\.h[\">]", "private", "<QDateTimeEdit>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qdial\\.h[\">]", "private", "<QDial>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qdialog\\.h[\">]", "private", "<QDialog>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qdialogbuttonbox\\.h[\">]", "private", "<QDialogButtonBox>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qdockwidget\\.h[\">]", "private", "<QDockWidget>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qerrormessage\\.h[\">]", "private", "<QErrorMessage>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qfiledialog\\.h[\">]", "private", "<QFileDialog>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qfileiconprovider\\.h[\">]", "private", "<QFileIconProvider>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qfocusframe\\.h[\">]", "private", "<QFocusFrame>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qfontcombobox\\.h[\">]", "private", "<QFontComboBox>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qfontdialog\\.h[\">]", "private", "<QFontDialog>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qformlayout\\.h[\">]", "private", "<QFormLayout>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qframe\\.h[\">]", "private", "<QFrame>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qgesture\\.h[\">]", "private", "<QGesture>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qgesturerecognizer\\.h[\">]", "private", "<QGestureRecognizer>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qgraphicsanchorlayout\\.h[\">]", "private", "<QGraphicsAnchorLayout>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qgraphicseffect\\.h[\">]", "private", "<QGraphicsEffect>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qgraphicsgridlayout\\.h[\">]", "private", "<QGraphicsGridLayout>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qgraphicsitem\\.h[\">]", "private", "<QGraphicsItem>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qgraphicsitemanimation\\.h[\">]", "private", "<QGraphicsItemAnimation>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qgraphicslayout\\.h[\">]", "private", "<QGraphicsLayout>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qgraphicslayoutitem\\.h[\">]", "private", "<QGraphicsLayoutItem>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qgraphicslinearlayout\\.h[\">]", "private", "<QGraphicsLinearLayout>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qgraphicsproxywidget\\.h[\">]", "private", "<QGraphicsProxyWidget>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qgraphicsscene\\.h[\">]", "private", "<QGraphicsScene>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qgraphicssceneevent\\.h[\">]", "private", "<QGraphicsSceneEvent>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qgraphicstransform\\.h[\">]", "private", "<QGraphicsTransform>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qgraphicsview\\.h[\">]", "private", "<QGraphicsView>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qgraphicswidget\\.h[\">]", "private", "<QGraphicsWidget>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qgridlayout\\.h[\">]", "private", "<QGridLayout>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qgroupbox\\.h[\">]", "private", "<QGroupBox>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qheaderview\\.h[\">]", "private", "<QHeaderView>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qinputdialog\\.h[\">]", "private", "<QInputDialog>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qitemdelegate\\.h[\">]", "private", "<QItemDelegate>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qitemeditorfactory\\.h[\">]", "private", "<QItemEditorFactory>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qkeysequenceedit\\.h[\">]", "private", "<QKeySequenceEdit>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qlabel\\.h[\">]", "private", "<QLabel>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qlayout\\.h[\">]", "private", "<QLayout>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qlayoutitem\\.h[\">]", "private", "<QLayoutItem>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qlcdnumber\\.h[\">]", "private", "<QLCDNumber>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qlineedit\\.h[\">]", "private", "<QLineEdit>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qlistview\\.h[\">]", "private", "<QListView>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qlistwidget\\.h[\">]", "private", "<QListWidget>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qmainwindow\\.h[\">]", "private", "<QMainWindow>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qmdiarea\\.h[\">]", "private", "<QMdiArea>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qmdisubwindow\\.h[\">]", "private", "<QMdiSubWindow>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qmenu\\.h[\">]", "private", "<QMenu>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qmenubar\\.h[\">]", "private", "<QMenuBar>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qmessagebox\\.h[\">]", "private", "<QMessageBox>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qplaintextedit\\.h[\">]", "private", "<QPlainTextEdit>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qprogressbar\\.h[\">]", "private", "<QProgressBar>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qprogressdialog\\.h[\">]", "private", "<QProgressDialog>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qproxystyle\\.h[\">]", "private", "<QProxyStyle>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qpushbutton\\.h[\">]", "private", "<QPushButton>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qradiobutton\\.h[\">]", "private", "<QRadioButton>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qrhiwidget\\.h[\">]", "private", "<QRhiWidget>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qrubberband\\.h[\">]", "private", "<QRubberBand>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qscrollarea\\.h[\">]", "private", "<QScrollArea>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qscrollbar\\.h[\">]", "private", "<QScrollBar>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qscroller\\.h[\">]", "private", "<QScroller>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qscrollerproperties\\.h[\">]", "private", "<QScrollerProperties>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qsizegrip\\.h[\">]", "private", "<QSizeGrip>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qsizepolicy\\.h[\">]", "private", "<QSizePolicy>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qslider\\.h[\">]", "private", "<QSlider>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qspinbox\\.h[\">]", "private", "<QSpinBox>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qsplashscreen\\.h[\">]", "private", "<QSplashScreen>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qsplitter\\.h[\">]", "private", "<QSplitter>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qstackedlayout\\.h[\">]", "private", "<QStackedLayout>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qstackedwidget\\.h[\">]", "private", "<QStackedWidget>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qstatusbar\\.h[\">]", "private", "<QStatusBar>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qstyle\\.h[\">]", "private", "<QStyle>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qstyleditemdelegate\\.h[\">]", "private", "<QStyledItemDelegate>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qstylefactory\\.h[\">]", "private", "<QStyleFactory>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qstyleoption\\.h[\">]", "private", "<QStyleOption>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qstylepainter\\.h[\">]", "private", "<QStylePainter>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qstyleplugin\\.h[\">]", "private", "<QStylePlugin>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qsystemtrayicon\\.h[\">]", "private", "<QSystemTrayIcon>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qtabbar\\.h[\">]", "private", "<QTabBar>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qtableview\\.h[\">]", "private", "<QTableView>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qtablewidget\\.h[\">]", "private", "<QTableWidget>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qtabwidget\\.h[\">]", "private", "<QTabWidget>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qtextbrowser\\.h[\">]", "private", "<QTextBrowser>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qtextedit\\.h[\">]", "private", "<QTextEdit>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qtoolbar\\.h[\">]", "private", "<QToolBar>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qtoolbox\\.h[\">]", "private", "<QToolBox>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qtoolbutton\\.h[\">]", "private", "<QToolButton>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qtooltip\\.h[\">]", "private", "<QToolTip>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qtreeview\\.h[\">]", "private", "<QTreeView>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qtreewidget\\.h[\">]", "private", "<QTreeWidget>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qtreewidgetitemiterator\\.h[\">]", "private", "<QTreeWidgetItemIterator>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qtwidgetsversion\\.h[\">]", "private", "<QtWidgetsVersion>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qundoview\\.h[\">]", "private", "<QUndoView>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qwhatsthis\\.h[\">]", "private", "<QWhatsThis>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qwidget\\.h[\">]", "private", "<QWidget>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qwidgetaction\\.h[\">]", "private", "<QWidgetAction>", "public"] },
-  { "include": [ "@[\"<](QtWidgets/)?qwizard\\.h[\">]", "private", "<QWizard>", "public"] },
-  { "include": [ "@[\"<](QtWlShellIntegration/)?qtwlshellintegrationversion\\.h[\">]", "private", "<QtWlShellIntegrationVersion>", "public"] },
-  { "include": [ "@[\"<](QtXml/)?qtxmlversion\\.h[\">]", "private", "<QtXmlVersion>", "public"] }
-]
diff --git a/servatrice/CMakeLists.txt b/servatrice/CMakeLists.txt
index b45608d86..21f71a908 100644
--- a/servatrice/CMakeLists.txt
+++ b/servatrice/CMakeLists.txt
@@ -27,14 +27,6 @@ set(servatrice_SOURCES
 
 set(servatrice_RESOURCES servatrice.qrc)
 
-# Qxt SMTP is vendored.
-cockatrice_disable_sanitizers_for(
-  src/smtp/qxthmac.cpp src/smtp/qxtmailattachment.cpp src/smtp/qxtmailmessage.cpp src/smtp/qxtsmtp.cpp
-)
-cockatrice_disable_coverage_for(
-  src/smtp/qxthmac.cpp src/smtp/qxtmailattachment.cpp src/smtp/qxtmailmessage.cpp src/smtp/qxtsmtp.cpp
-)
-
 if(WIN32)
   set(servatrice_SOURCES ${servatrice_SOURCES} servatrice.rc)
 endif(WIN32)
diff --git a/servatrice/servatrice.ini.example b/servatrice/servatrice.ini.example
index 3ee52dd21..ccd4f3c3f 100644
--- a/servatrice/servatrice.ini.example
+++ b/servatrice/servatrice.ini.example
@@ -41,12 +41,6 @@ websocket_host=any
 ; The TCP port number servatrice will listen on for websockets clients; default is 4748
 websocket_port=4748
 
-; If websockets are served through a reverse proxy (e.g. nginx), the real client address can be
-; read from an HTTP header such as X-Forwarded-For. The header is ONLY trusted when the websocket
-; connection itself originates from an address listed in security/trusted_sources (default 127.0.0.1,::1),
-; so that clients cannot spoof their address to bypass bans or rate limits.
-web_socket_ip_header=
-
 ; When database is enabled, servatrice writes the server status in the "update" database table; this
 ; setting defines every how many milliseconds servatrice will update its status; default is 15000 (15 secs)
 statusupdate=15000
@@ -250,16 +244,6 @@ email=root@localhost
 ; Sender email name
 name="Cockatrice server"
 
-; Maximum number of attempts to deliver a given e-mail before giving up.
-; If the smtp server is unreachable or repeatedly rejects a message, the server
-; will retry with an exponentially growing delay up to this many times, then drop
-; the message from the queue and log the failure. Default: 5
-maxretries=5
-
-; Initial retry delay in seconds between delivery attempts. Doubles with each
-; failed attempt (capped at 30 minutes). Default: 60
-retrydelay=60
-
 ; Email subject
 subject="Cockatrice server account activation token"
 
diff --git a/servatrice/src/email_parser.cpp b/servatrice/src/email_parser.cpp
index 44c788e67..d8c30d852 100644
--- a/servatrice/src/email_parser.cpp
+++ b/servatrice/src/email_parser.cpp
@@ -1,8 +1,6 @@
 #include "email_parser.h"
 
 #include <QRegularExpression>
-#include <QRegularExpressionMatch>
-#include <QSharedPointer>
 #include <QString>
 
 QPair<QString, QString> EmailParser::parseEmailAddress(const QString &dirtyEmailAddress)
diff --git a/servatrice/src/event_loop_watchdog.cpp b/servatrice/src/event_loop_watchdog.cpp
index a2f20ff1c..e50bd4201 100644
--- a/servatrice/src/event_loop_watchdog.cpp
+++ b/servatrice/src/event_loop_watchdog.cpp
@@ -8,8 +8,6 @@
 #include "servatrice.h"
 
 #include <QTimer>
-#include <QtGlobal>
-#include <utility>
 
 EventLoopWatchdog::EventLoopWatchdog(Servatrice *_servatrice, QString _threadName)
     : QObject(nullptr), servatrice(_servatrice), threadName(std::move(_threadName))
diff --git a/servatrice/src/event_loop_watchdog.h b/servatrice/src/event_loop_watchdog.h
index d05430eaa..b9061ff97 100644
--- a/servatrice/src/event_loop_watchdog.h
+++ b/servatrice/src/event_loop_watchdog.h
@@ -9,7 +9,6 @@
 #include <QElapsedTimer>
 #include <QObject>
 #include <QString>
-#include <qtmetamacros.h>
 
 class Servatrice;
 class QTimer;
diff --git a/servatrice/src/isl_interface.cpp b/servatrice/src/isl_interface.cpp
index a78ee9e72..b0ee201bf 100644
--- a/servatrice/src/isl_interface.cpp
+++ b/servatrice/src/isl_interface.cpp
@@ -1,34 +1,11 @@
 #include "isl_interface.h"
 
-#include "libcockatrice/protocol/pb/commands.pb.h"
-#include "libcockatrice/protocol/pb/room_commands.pb.h"
-#include "libcockatrice/protocol/pb/room_event.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_game.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_room.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_user.pb.h"
-#include "libcockatrice/protocol/pb/session_event.pb.h"
 #include "main.h"
-#include "servatrice.h"
-#include "server_abstractuserinterface.h"
 #include "server_logger.h"
-#include "serverinfo_user_container.h"
 
-#include <QDebug>
-#include <QHostAddress>
-#include <QList>
 #include <QLoggingCategory>
-#include <QMap>
-#include <QMapIterator>
-#include <QMessageLogger>
-#include <QMutexLocker>
-#include <QReadLocker>
-#include <QReadWriteLock>
-#include <QSharedPointer>
-#include <QSslError>
 #include <QSslSocket>
 #include <google/protobuf/descriptor.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/stubs/common.h>
 #include <libcockatrice/protocol/debug_pb_message.h>
 #include <libcockatrice/protocol/get_pb_extension.h>
 #include <libcockatrice/protocol/pb/event_game_joined.pb.h>
@@ -40,15 +17,11 @@
 #include <libcockatrice/protocol/pb/event_server_complete_list.pb.h>
 #include <libcockatrice/protocol/pb/event_user_joined.pb.h>
 #include <libcockatrice/protocol/pb/event_user_left.pb.h>
+#include <libcockatrice/protocol/pb/event_user_message.pb.h>
 #include <libcockatrice/protocol/pb/isl_message.pb.h>
-#include <qnamespace.h>
-#include <qobjectdefs.h>
 #include <server_protocolhandler.h>
 #include <server_room.h>
 
-// Maximum size of a single ISL message.
-static const int MAX_ISL_MESSAGE_SIZE = 4 * 1024 * 1024;
-
 inline Q_LOGGING_CATEGORY(IslInterfaceLog, "isl_interface");
 
 void IslInterface::sharedCtor(const QSslCertificate &cert, const QSslKey &privateKey)
@@ -270,13 +243,6 @@ void IslInterface::readClient()
                                 (((quint32)(unsigned char)inputBuffer[1]) << 16) +
                                 (((quint32)(unsigned char)inputBuffer[2]) << 8) +
                                 ((quint32)(unsigned char)inputBuffer[3]);
-                // Reject implausible lengths instead of buffering until they arrive.
-                // This also handles lengths that overflow into negative int values.
-                if (messageLength < 0 || messageLength > MAX_ISL_MESSAGE_SIZE) {
-                    qCWarning(IslInterfaceLog) << "Invalid message length" << messageLength << "from" << peerAddress;
-                    socket->disconnectFromHost();
-                    return;
-                }
                 inputBuffer.remove(0, 4);
                 messageInProgress = true;
             } else {
diff --git a/servatrice/src/isl_interface.h b/servatrice/src/isl_interface.h
index f7680c0a2..27e5b8293 100644
--- a/servatrice/src/isl_interface.h
+++ b/servatrice/src/isl_interface.h
@@ -1,26 +1,21 @@
 #ifndef ISL_INTERFACE_H
 #define ISL_INTERFACE_H
 
-#include <QAbstractSocket>
-#include <QByteArray>
-#include <QMutex>
-#include <QObject>
-#include <QSslCertificate>
-#include <QString>
+#include "servatrice.h"
 
-// IWYU pragma: keep
-// ServerInfo_User and ServerInfo_Game are passed by value to signals, so the
-// moc-generated code needs the complete types.
-#include <QtGlobal>
+#include <QSslCertificate>
+#include <QWaitCondition>
 #include <libcockatrice/protocol/pb/serverinfo_game.pb.h>
+#include <libcockatrice/protocol/pb/serverinfo_room.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
-#include <qtmetamacros.h>
 
 class Servatrice;
 class QSslSocket;
 class QSslKey;
 class IslMessage;
+
 class Event_ServerCompleteList;
+class Event_UserMessage;
 class Event_UserJoined;
 class Event_UserLeft;
 class Event_JoinRoom;
@@ -29,11 +24,6 @@ class Event_RoomSay;
 class Event_ListGames;
 class Event_RemoveMessages;
 class Command_JoinGame;
-class CommandContainer;
-class GameEventContainer;
-class Response;
-class RoomEvent;
-class SessionEvent;
 
 class IslInterface : public QObject
 {
diff --git a/servatrice/src/main.cpp b/servatrice/src/main.cpp
index eb019a2b7..13bf95a82 100644
--- a/servatrice/src/main.cpp
+++ b/servatrice/src/main.cpp
@@ -18,7 +18,6 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#include "libcockatrice/rng/rng_abstract.h"
 #include "servatrice.h"
 #include "server_logger.h"
 #include "settingscache.h"
@@ -26,29 +25,16 @@
 #include "smtpclient.h"
 #include "version_string.h"
 
-#include <QCommandLineOption>
 #include <QCommandLineParser>
 #include <QCoreApplication>
 #include <QDateTime>
-#include <QDebug>
 #include <QFile>
-#include <QList>
-#include <QMetaObject>
 #include <QMetaType>
-#include <QObject>
-#include <QSharedPointer>
-#include <QString>
-#include <QThread>
-#include <QVariant>
-#include <QVector>
-#include <google/protobuf/stubs/common.h>
+#include <QtGlobal>
 #include <iostream>
 #include <libcockatrice/rng/rng_sfmt.h>
 #include <libcockatrice/utility/cryptoutil.h>
 #include <libcockatrice/utility/passwordhasher.h>
-#include <qlogging.h>
-#include <qnamespace.h>
-#include <string>
 
 RNG_Abstract *rng;
 ServerLogger *logger;
diff --git a/servatrice/src/metrics_registry.cpp b/servatrice/src/metrics_registry.cpp
index 51abb7e3e..99ce390f1 100644
--- a/servatrice/src/metrics_registry.cpp
+++ b/servatrice/src/metrics_registry.cpp
@@ -1,7 +1,6 @@
 #include "metrics_registry.h"
 
 #include <QList>
-#include <stddef.h>
 
 void MetricsRegistry::observeCommand(int typeId, qint64 elapsedMs)
 {
diff --git a/servatrice/src/metrics_registry.h b/servatrice/src/metrics_registry.h
index 1175d03c4..4df1057c2 100644
--- a/servatrice/src/metrics_registry.h
+++ b/servatrice/src/metrics_registry.h
@@ -7,7 +7,7 @@
 #define METRICS_REGISTRY_H
 
 #include <QList>
-#include <QtGlobal>
+#include <QString>
 #include <array>
 #include <atomic>
 
diff --git a/servatrice/src/servatrice.cpp b/servatrice/src/servatrice.cpp
index 9ec9ef5bc..3dd7ab510 100644
--- a/servatrice/src/servatrice.cpp
+++ b/servatrice/src/servatrice.cpp
@@ -22,14 +22,10 @@
 #include "email_parser.h"
 #include "event_loop_watchdog.h"
 #include "isl_interface.h"
-#include "libcockatrice/protocol/pb/response_report_stats.pb.h"
-#include "libcockatrice/protocol/pb/session_event.pb.h"
 #include "main.h"
 #include "servatrice_connection_pool.h"
 #include "servatrice_database_interface.h"
-#include "server.h"
 #include "server_logger.h"
-#include "server_protocolhandler.h"
 #include "serversocketinterface.h"
 #include "settingscache.h"
 #include "smtpclient.h"
@@ -37,40 +33,20 @@
 #include <QDateTime>
 #include <QDebug>
 #include <QFile>
-#include <QIODevice>
-#include <QLoggingCategory>
-#include <QMapIterator>
-#include <QMetaObject>
-#include <QMutableListIterator>
-#include <QObject>
 #include <QProcessEnvironment>
-#include <QReadLocker>
-#include <QSharedPointer>
-#include <QSqlDatabase>
 #include <QSqlQuery>
-#include <QSsl>
 #include <QString>
 #include <QStringList>
-#include <QThread>
 #include <QTimer>
-#include <QTypeInfo>
 #include <QUrl>
-#include <QVariant>
-#include <QtGlobal>
-#include <compare>
 #include <game/server_game.h>
-#include <google/protobuf/stubs/port.h>
+#include <iostream>
+#include <libcockatrice/deck_list/deck_list.h>
 #include <libcockatrice/protocol/featureset.h>
 #include <libcockatrice/protocol/pb/event_connection_closed.pb.h>
 #include <libcockatrice/protocol/pb/event_server_message.pb.h>
 #include <libcockatrice/protocol/pb/event_server_shutdown.pb.h>
-#include <new>
-#include <qlogging.h>
-#include <qnamespace.h>
 #include <server_room.h>
-#include <string>
-
-inline Q_LOGGING_CATEGORY(ServatriceLog, "servatrice");
 
 Servatrice_GameServer::Servatrice_GameServer(Servatrice *_server,
                                              int _numberPools,
@@ -338,11 +314,6 @@ bool Servatrice::initServer()
         servatriceDatabaseInterface->clearSessionTables();
     }
 
-    // Connect the SMTP client's delivery-confirmation signals to the database cleanup handlers.
-    // Emails are removed from the queue tables only after delivery is confirmed (see statusUpdate()).
-    connect(smtpClient, &SmtpClient::mailDelivered, this, &Servatrice::onEmailDelivered);
-    connect(smtpClient, &SmtpClient::mailPermanentlyFailed, this, &Servatrice::onEmailPermanentlyFailed);
-
     if (getRoomsMethodString() == "sql") {
         QSqlQuery *query = servatriceDatabaseInterface->prepareQuery(
             "select id, name, descr, permissionlevel, privlevel, auto_join, join_message, chat_history_size from "
@@ -745,36 +716,41 @@ void Servatrice::statusUpdate()
                 return;
             }
 
-            // Rows are intentionally NOT deleted here: the durable source of truth for a pending
-            // activation e-mail is the database row, which is only removed once delivery has been
-            // confirmed by the SMTP client (see onEmailDelivered). This makes sending resilient to
-            // transient SMTP failures and server restarts.
+            auto *queryDelete =
+                servatriceDatabaseInterface->prepareQuery("delete from {prefix}_activation_emails where name = :name");
+
             while (servDbSelQuery->next()) {
                 const QString userName = servDbSelQuery->value(0).toString();
                 const auto emailAddress = EmailParser::getParsedEmailAddress(servDbSelQuery->value(1).toString());
                 const QString token = servDbSelQuery->value(2).toString();
 
-                smtpClient->enqueueActivationTokenMail(userName, emailAddress, token);
+                if (smtpClient->enqueueActivationTokenMail(userName, emailAddress, token)) {
+                    queryDelete->bindValue(":name", userName);
+                    servatriceDatabaseInterface->execSqlQuery(queryDelete);
+                }
             }
         }
 
         if (getEnableForgotPassword()) {
             auto *forgotPwQuery = servatriceDatabaseInterface->prepareQuery(
-                "select a.id, a.name, b.email, b.token from {prefix}_forgot_password a left join {prefix}_users b on "
-                "a.name = b.name where a.emailed = 0");
+                "select a.name, b.email, b.token from {prefix}_forgot_password a left join {prefix}_users b on a.name "
+                "= b.name where a.emailed = 0");
             if (!servatriceDatabaseInterface->execSqlQuery(forgotPwQuery)) {
                 return;
             }
 
-            // Rows are intentionally left with emailed = 0 here; they are marked emailed only once
-            // delivery is confirmed by the SMTP client (see onEmailDelivered).
-            while (forgotPwQuery->next()) {
-                const qint64 rowId = forgotPwQuery->value(0).toLongLong();
-                const QString userName = forgotPwQuery->value(1).toString();
-                const auto emailAddress = EmailParser::getParsedEmailAddress(forgotPwQuery->value(2).toString());
-                const QString token = forgotPwQuery->value(3).toString();
+            QSqlQuery *queryDelete = servatriceDatabaseInterface->prepareQuery(
+                "update {prefix}_forgot_password set emailed = 1 where name = :name");
 
-                smtpClient->enqueueForgotPasswordTokenMail(userName, emailAddress, token, rowId);
+            while (forgotPwQuery->next()) {
+                const QString userName = forgotPwQuery->value(0).toString();
+                const auto emailAddress = EmailParser::getParsedEmailAddress(forgotPwQuery->value(1).toString());
+                const QString token = forgotPwQuery->value(2).toString();
+
+                if (smtpClient->enqueueForgotPasswordTokenMail(userName, emailAddress, token)) {
+                    queryDelete->bindValue(":name", userName);
+                    servatriceDatabaseInterface->execSqlQuery(queryDelete);
+                }
             }
         }
 
@@ -782,69 +758,6 @@ void Servatrice::statusUpdate()
     }
 }
 
-void Servatrice::onEmailDelivered(const QString &userName, EmailType type, const QString &token, qint64 rowId)
-{
-    if (cleanupDatabaseForEmail(userName, type, token, rowId)) {
-        qCDebug(ServatriceLog) << "E-mail delivered to" << userName;
-    } else {
-        qCWarning(ServatriceLog) << "Failed to clean up database row for delivered e-mail to" << userName
-                                 << "- row may be re-enqueued on next status update";
-    }
-}
-
-void Servatrice::onEmailPermanentlyFailed(const QString &userName,
-                                          EmailType type,
-                                          FailureReason reason,
-                                          const QString &token,
-                                          qint64 rowId)
-{
-    switch (reason) {
-        case FailureReason::RetryExhausted:
-            qCWarning(ServatriceLog) << "E-mail to" << userName << "permanently failed after max retries";
-            break;
-        case FailureReason::RecipientRejected:
-            qCWarning(ServatriceLog) << "E-mail to" << userName << "permanently failed: recipient rejected";
-            break;
-        case FailureReason::SenderRejected:
-            qCWarning(ServatriceLog) << "E-mail to" << userName << "permanently failed: sender rejected";
-            break;
-    }
-
-    if (!cleanupDatabaseForEmail(userName, type, token, rowId)) {
-        qCWarning(ServatriceLog) << "Failed to clean up database row for permanently failed e-mail to" << userName
-                                 << "- row may be re-enqueued on next status update";
-    }
-}
-
-bool Servatrice::cleanupDatabaseForEmail(const QString &userName, EmailType type, const QString &token, qint64 rowId)
-{
-    Q_UNUSED(token);
-    switch (type) {
-        case EmailType::Activation: {
-            QSqlQuery *query =
-                servatriceDatabaseInterface->prepareQuery("delete from {prefix}_activation_emails where name = :name");
-            query->bindValue(":name", userName);
-            return servatriceDatabaseInterface->execSqlQuery(query);
-        }
-        case EmailType::ForgotPassword: {
-            // Scope the update to the row that was actually sent: the table
-            // holds one row per request, and marking by name would also mark
-            // rows for newer tokens that were never delivered.
-            if (rowId >= 0) {
-                QSqlQuery *query = servatriceDatabaseInterface->prepareQuery(
-                    "update {prefix}_forgot_password set emailed = 1 where id = :id");
-                query->bindValue(":id", rowId);
-                return servatriceDatabaseInterface->execSqlQuery(query);
-            }
-            QSqlQuery *query = servatriceDatabaseInterface->prepareQuery(
-                "update {prefix}_forgot_password set emailed = 1 where name = :name");
-            query->bindValue(":name", userName);
-            return servatriceDatabaseInterface->execSqlQuery(query);
-        }
-    }
-    return false;
-}
-
 SessionEvent *Servatrice::makeShutdownEvent() const
 {
     Event_ServerShutdown event;
diff --git a/servatrice/src/servatrice.h b/servatrice/src/servatrice.h
index 205a4f04d..f39a44d51 100644
--- a/servatrice/src/servatrice.h
+++ b/servatrice/src/servatrice.h
@@ -21,46 +21,35 @@
 #define SERVATRICE_H
 
 #include "metrics_registry.h"
-#include "smtpclient.h"
 
-#include <QByteArray>
 #include <QDateTime>
 #include <QHostAddress>
-#include <QList>
-#include <QMap>
 #include <QMetaType>
 #include <QMutex>
-#include <QMutexLocker>
 #include <QReadWriteLock>
+#include <QSqlDatabase>
 #include <QSslCertificate>
 #include <QSslKey>
-#include <QString>
-
-// IWYU pragma: keep
-// Q_DECLARE_METATYPE below needs the complete type.
-#include <QSqlDatabase>
 #include <QTcpServer>
 #include <QWebSocketServer>
-#include <QtGlobal>
 #include <atomic>
 #include <libcockatrice/protocol/pb/response_report_stats.pb.h>
 #include <memory>
-#include <qtmetamacros.h>
 #include <server.h>
 #include <utility>
 
-class QObject;
-class QThread;
-class SessionEvent;
-
 Q_DECLARE_METATYPE(QSqlDatabase)
 
+class QSqlQuery;
 class QTimer;
+
+class GameReplay;
 class Servatrice;
 class Servatrice_ConnectionPool;
 class Servatrice_DatabaseInterface;
 class AbstractServerSocketInterface;
 class IslInterface;
+class FeatureSet;
 
 class Servatrice_GameServer : public QTcpServer
 {
@@ -182,7 +171,6 @@ private:
     QMap<QString, bool> serverRequiredFeatureList;
     QString officialWarnings;
     Servatrice_DatabaseInterface *servatriceDatabaseInterface;
-    bool cleanupDatabaseForEmail(const QString &userName, EmailType type, const QString &token, qint64 rowId);
     int serverId;
     int uptime;
     QMutex txBytesMutex, rxBytesMutex;
@@ -233,12 +221,6 @@ public slots:
     void scheduleShutdown(const QString &reason, int minutes);
     void updateLoginMessage();
     void setRequiredFeatures(const QString &featureList);
-    void onEmailDelivered(const QString &userName, EmailType type, const QString &token, qint64 rowId);
-    void onEmailPermanentlyFailed(const QString &userName,
-                                  EmailType type,
-                                  FailureReason reason,
-                                  const QString &token,
-                                  qint64 rowId);
 
 public:
     explicit Servatrice(QObject *parent = nullptr);
diff --git a/servatrice/src/servatrice_connection_pool.h b/servatrice/src/servatrice_connection_pool.h
index ddd12fc95..7479122cf 100644
--- a/servatrice/src/servatrice_connection_pool.h
+++ b/servatrice/src/servatrice_connection_pool.h
@@ -4,7 +4,6 @@
 #include <QMutex>
 #include <QMutexLocker>
 #include <QObject>
-#include <qtmetamacros.h>
 
 class Servatrice_DatabaseInterface;
 
diff --git a/servatrice/src/servatrice_database_interface.cpp b/servatrice/src/servatrice_database_interface.cpp
index ac3a19c8e..bb67d78eb 100644
--- a/servatrice/src/servatrice_database_interface.cpp
+++ b/servatrice/src/servatrice_database_interface.cpp
@@ -1,46 +1,24 @@
 #include "servatrice_database_interface.h"
 
 #include "deck_tag_serialization.h"
-#include "libcockatrice/protocol/pb/response.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_chat_message.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_game.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_moderator_login.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_user_alt.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_user_session.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_warning.pb.h"
 #include "servatrice.h"
-#include "server.h"
-#include "server_protocolhandler.h"
+#include "serversocketinterface.h"
 #include "settingscache.h"
 
-#include <QByteArray>
 #include <QChar>
 #include <QDateTime>
 #include <QDebug>
+#include <QJsonArray>
 #include <QJsonDocument>
 #include <QJsonObject>
-#include <QJsonValue>
 #include <QLoggingCategory>
-#include <QMap>
-#include <QMessageLogger>
-#include <QRegularExpression>
-#include <QRegularExpressionMatch>
-#include <QSet>
-#include <QSetIterator>
-#include <QSharedPointer>
 #include <QSqlError>
 #include <QSqlQuery>
 #include <QStringList>
-#include <QVariant>
-#include <QVariantList>
-#include <google/protobuf/stubs/common.h>
 #include <libcockatrice/deck_list/deck_list.h>
 #include <libcockatrice/protocol/pb/game_replay.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
 #include <libcockatrice/utility/passwordhasher.h>
-#include <qalgorithms.h>
-#include <qnamespace.h>
-#include <string>
 
 inline Q_LOGGING_CATEGORY(DatabaseInterfaceLog, "database_interface");
 
diff --git a/servatrice/src/servatrice_database_interface.h b/servatrice/src/servatrice_database_interface.h
index 0509d1a03..ce51a2474 100644
--- a/servatrice/src/servatrice_database_interface.h
+++ b/servatrice/src/servatrice_database_interface.h
@@ -1,26 +1,18 @@
 #ifndef SERVATRICE_DATABASE_INTERFACE_H
 #define SERVATRICE_DATABASE_INTERFACE_H
 
-#include "libcockatrice/protocol/pb/serverinfo_user.pb.h"
-
+#include <QChar>
 #include <QHash>
-#include <QList>
+#include <QObject>
 #include <QSqlDatabase>
-#include <QString>
-#include <QStringList>
-#include <QtGlobal>
-#include <libcockatrice/protocol/pb/serverinfo_ban.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_chat_message.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_moderator_login.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_user_alt.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_user_session.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_warning.pb.h>
-#include <qtmetamacros.h>
 #include <server.h>
 #include <server_database_interface.h>
 
-class QSqlQuery;
-
 #define DATABASE_SCHEMA_VERSION 37
 
 class Servatrice;
diff --git a/servatrice/src/server_logger.cpp b/servatrice/src/server_logger.cpp
index 1972444f1..620780052 100644
--- a/servatrice/src/server_logger.cpp
+++ b/servatrice/src/server_logger.cpp
@@ -6,16 +6,8 @@
 #include <QDir>
 #include <QFile>
 #include <QFileInfo>
-#include <QForeach>
-#include <QIODevice>
 #include <QTextStream>
-#include <QThread>
-#include <QVariant>
-#include <QtGlobal>
 #include <iostream>
-#include <qnamespace.h>
-#include <qobjectdefs.h>
-#include <string>
 
 ServerLogger::ServerLogger(bool _logToConsole, QObject *parent)
     : QObject(parent), logToConsole(_logToConsole), flushRunning(false)
diff --git a/servatrice/src/server_logger.h b/servatrice/src/server_logger.h
index f2875a6a3..0ad092b66 100644
--- a/servatrice/src/server_logger.h
+++ b/servatrice/src/server_logger.h
@@ -1,14 +1,14 @@
 #ifndef SERVER_LOGGER_H
 #define SERVER_LOGGER_H
 
-#include <QList>
 #include <QMutex>
 #include <QObject>
-#include <QString>
 #include <QStringList>
-#include <qtmetamacros.h>
+#include <QThread>
+#include <QWaitCondition>
 
 class QFile;
+class Server_ProtocolHandler;
 
 class ServerLogger : public QObject
 {
diff --git a/servatrice/src/serversocketinterface.cpp b/servatrice/src/serversocketinterface.cpp
index 5f5d1ced5..a8d13675d 100644
--- a/servatrice/src/serversocketinterface.cpp
+++ b/servatrice/src/serversocketinterface.cpp
@@ -22,63 +22,28 @@
 
 #include "deck_tag_serialization.h"
 #include "email_parser.h"
-#include "libcockatrice/protocol/pb/admin_commands.pb.h"
-#include "libcockatrice/protocol/pb/developer_commands.pb.h"
-#include "libcockatrice/protocol/pb/moderator_commands.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_deck_share_item.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_deck_share_summary.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_replay_match.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_report.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_warning.pb.h"
-#include "libcockatrice/protocol/pb/session_commands.pb.h"
-#include "libcockatrice/protocol/pb/session_event.pb.h"
-#include "libcockatrice/utility/card_ref.h"
 #include "main.h"
-#include "metrics_registry.h"
 #include "servatrice.h"
 #include "servatrice_database_interface.h"
-#include "server.h"
-#include "server_database_interface.h"
 #include "server_logger.h"
-#include "server_protocolhandler.h"
 #include "settingscache.h"
 #include "version_string.h"
 
-#include <QChar>
-#include <QCryptographicHash>
 #include <QDateTime>
 #include <QDebug>
 #include <QElapsedTimer>
 #include <QHostAddress>
 #include <QJsonDocument>
 #include <QJsonObject>
-#include <QJsonValueRef>
-#include <QListIterator>
 #include <QLoggingCategory>
-#include <QMap>
-#include <QMessageLogger>
-#include <QMetaObject>
-#include <QMetaType>
-#include <QMutexLocker>
-#include <QNetworkRequest>
 #include <QRandomGenerator>
-#include <QReadLocker>
-#include <QReadWriteLock>
-#include <QSharedPointer>
+#include <QRegularExpression>
 #include <QSqlError>
 #include <QSqlQuery>
 #include <QString>
-#include <QStringLiteral>
-#include <QTextStream>
-#include <QVariant>
-#include <QtGlobal>
 #include <algorithm>
-#include <exception>
+#include <game/server_player.h>
 #include <google/protobuf/descriptor.h>
-#include <google/protobuf/repeated_ptr_field.h>
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/port.h>
-#include <initializer_list>
 #include <iostream>
 #include <libcockatrice/deck_list/deck_list.h>
 #include <libcockatrice/protocol/get_pb_extension.h>
@@ -110,7 +75,6 @@
 #include <libcockatrice/protocol/pb/command_report_details.pb.h>
 #include <libcockatrice/protocol/pb/command_report_list.pb.h>
 #include <libcockatrice/protocol/pb/command_report_my_list.pb.h>
-#include <libcockatrice/protocol/pb/command_report_reopen.pb.h>
 #include <libcockatrice/protocol/pb/command_report_resolve.pb.h>
 #include <libcockatrice/protocol/pb/command_report_stats.pb.h>
 #include <libcockatrice/protocol/pb/command_report_user_info.pb.h>
@@ -121,6 +85,8 @@
 #include <libcockatrice/protocol/pb/event_remove_from_list.pb.h>
 #include <libcockatrice/protocol/pb/event_replay_added.pb.h>
 #include <libcockatrice/protocol/pb/event_server_identification.pb.h>
+#include <libcockatrice/protocol/pb/event_server_message.pb.h>
+#include <libcockatrice/protocol/pb/event_user_joined.pb.h>
 #include <libcockatrice/protocol/pb/event_user_message.pb.h>
 #include <libcockatrice/protocol/pb/response_ban_history.pb.h>
 #include <libcockatrice/protocol/pb/response_card_art_rule_entry.pb.h>
@@ -165,16 +131,9 @@
 #include <libcockatrice/utility/report_categories.h>
 #include <libcockatrice/utility/string_limits.h>
 #include <libcockatrice/utility/warning_categories.h>
-#include <memory>
-#include <qlogging.h>
-#include <qnamespace.h>
 #include <server_response_containers.h>
 #include <server_room.h>
-#include <stddef.h>
 #include <string>
-#include <utility>
-
-class QObject;
 
 inline Q_LOGGING_CATEGORY(AbstractServerSocketInterfaceLog, "abstract_server_socket_interface");
 inline Q_LOGGING_CATEGORY(TcpServerSocketInterfaceLog, "tcp_server_socket_interface");
@@ -182,9 +141,6 @@ inline Q_LOGGING_CATEGORY(WebsocketServerSocketInterfaceLog, "websocket_server_s
 
 static const int protocolVersion = 14;
 
-// Maximum size of a single TCP protocol message. Matches the websocket limit.
-static const int MAX_TCP_MESSAGE_SIZE = 1500000;
-
 AbstractServerSocketInterface::AbstractServerSocketInterface(Servatrice *_server,
                                                              Servatrice_DatabaseInterface *_databaseInterface,
                                                              QObject *parent)
@@ -435,8 +391,6 @@ Response::ResponseCode AbstractServerSocketInterface::processExtendedModeratorCo
             return cmdReportAssign(cmd.GetExtension(Command_ReportAssign::ext), rc);
         case ModeratorCommand::REPORT_RESOLVE:
             return cmdReportResolve(cmd.GetExtension(Command_ReportResolve::ext), rc);
-        case ModeratorCommand::REPORT_REOPEN:
-            return cmdReportReopen(cmd.GetExtension(Command_ReportReopen::ext), rc);
         case ModeratorCommand::VIEWLOG_HISTORY:
             return cmdGetLogHistory(cmd.GetExtension(Command_ViewLogHistory::ext), rc, true);
         case ModeratorCommand::GRANT_REPLAY_ACCESS:
@@ -1986,29 +1940,6 @@ Response::ResponseCode AbstractServerSocketInterface::cmdBanFromServer(const Com
     return Response::RespOk;
 }
 
-namespace
-{
-int reportUserLevel(bool userExists, int adminFlags)
-{
-    int userLevel = ServerInfo_User::IsUser;
-    if (userExists) {
-        userLevel |= ServerInfo_User::IsRegistered;
-        if (adminFlags & 1) {
-            userLevel |= ServerInfo_User::IsAdmin | ServerInfo_User::IsModerator;
-        } else if (adminFlags & 2) {
-            userLevel |= ServerInfo_User::IsModerator;
-        }
-        if (adminFlags & 4) {
-            userLevel |= ServerInfo_User::IsJudge;
-        }
-        if (adminFlags & 8) {
-            userLevel |= ServerInfo_User::IsDeveloper;
-        }
-    }
-    return userLevel;
-}
-} // namespace
-
 Response::ResponseCode AbstractServerSocketInterface::cmdReportList(const Command_ReportList &cmd,
                                                                     ResponseContainer &rc)
 {
@@ -2022,9 +1953,8 @@ Response::ResponseCode AbstractServerSocketInterface::cmdReportList(const Comman
 
     // Columns: 0=id, 1=reporter_name, 2=reported_user_name, 3=game_id,
     //          4=category, 5=description, 6=created_at, 7=status,
-    //          8=resolution_note, 9=assigned_mod_name, 10=resolved_by_name,
-    //          11=room_id, 12=replay_id,
-    //          13=reported_user_id, 14=reported_user_admin
+    //          8=resolution_note, 9=assigned_mod_name,
+    //          10=room_id, 11=replay_id
     QString whereClause;
     if (unresolvedOnly) {
         whereClause = "WHERE r.status = 'open' OR r.status = 'assigned' ";
@@ -2039,13 +1969,11 @@ Response::ResponseCode AbstractServerSocketInterface::cmdReportList(const Comman
 
     QString queryStr = "SELECT r.id, r.reporter_name, r.reported_user_name, r.game_id, "
                        "r.category, r.description, r.created_at, r.status, "
-                       "r.resolution_note, u.name AS assigned_mod_name, ru.name AS resolved_by_name, r.room_id, "
+                       "r.resolution_note, u.name AS assigned_mod_name, r.room_id, "
                        "(SELECT id FROM {prefix}_replays WHERE id_game = r.game_id ORDER BY id DESC LIMIT 1) "
-                       "AS replay_id, u2.id AS reported_user_id, u2.admin AS reported_user_admin "
+                       "AS replay_id "
                        "FROM {prefix}_reports r "
-                       "LEFT JOIN {prefix}_users u ON r.assigned_to = u.id "
-                       "LEFT JOIN {prefix}_users ru ON r.resolved_by = ru.id "
-                       "LEFT JOIN {prefix}_users u2 ON u2.name = r.reported_user_name ";
+                       "LEFT JOIN {prefix}_users u ON r.assigned_to = u.id ";
 
     if (unresolvedOnly) {
         queryStr += "WHERE r.status = 'open' OR r.status = 'assigned' ";
@@ -2086,19 +2014,14 @@ Response::ResponseCode AbstractServerSocketInterface::cmdReportList(const Comman
         if (!query->value(9).isNull()) {
             info->set_assigned_mod_name(query->value(9).toString().toStdString());
         }
+
         if (!query->value(10).isNull()) {
-            info->set_resolved_by_name(query->value(10).toString().toStdString());
+            info->set_room_id(query->value(10).toInt());
         }
 
         if (!query->value(11).isNull()) {
-            info->set_room_id(query->value(11).toInt());
+            info->set_replay_id(query->value(11).toInt());
         }
-
-        if (!query->value(12).isNull()) {
-            info->set_replay_id(query->value(12).toInt());
-        }
-
-        info->set_reported_user_level(reportUserLevel(!query->value(13).isNull(), query->value(14).toInt()));
     }
 
     rc.setResponseExtension(re);
@@ -2771,13 +2694,11 @@ Response::ResponseCode AbstractServerSocketInterface::cmdReportMyList(const Comm
 
     QString queryStr = "SELECT r.id, r.reporter_name, r.reported_user_name, r.game_id, "
                        "r.category, r.description, r.created_at, r.status, "
-                       "r.resolution_note, u.name AS assigned_mod_name, ru.name AS resolved_by_name, r.room_id, "
+                       "r.resolution_note, u.name AS assigned_mod_name, r.room_id, "
                        "(SELECT id FROM {prefix}_replays WHERE id_game = r.game_id ORDER BY id DESC LIMIT 1) "
-                       "AS replay_id, u2.id AS reported_user_id, u2.admin AS reported_user_admin "
+                       "AS replay_id "
                        "FROM {prefix}_reports r "
                        "LEFT JOIN {prefix}_users u ON r.assigned_to = u.id "
-                       "LEFT JOIN {prefix}_users ru ON r.resolved_by = ru.id "
-                       "LEFT JOIN {prefix}_users u2 ON u2.name = r.reported_user_name "
                        "WHERE r.reporter_id = :reporter_id "
                        "ORDER BY r.created_at DESC LIMIT 200";
 
@@ -2813,61 +2734,20 @@ Response::ResponseCode AbstractServerSocketInterface::cmdReportMyList(const Comm
         if (!query->value(9).isNull()) {
             info->set_assigned_mod_name(query->value(9).toString().toStdString());
         }
+
         if (!query->value(10).isNull()) {
-            info->set_resolved_by_name(query->value(10).toString().toStdString());
+            info->set_room_id(query->value(10).toInt());
         }
 
         if (!query->value(11).isNull()) {
-            info->set_room_id(query->value(11).toInt());
+            info->set_replay_id(query->value(11).toInt());
         }
-
-        if (!query->value(12).isNull()) {
-            info->set_replay_id(query->value(12).toInt());
-        }
-
-        info->set_reported_user_level(reportUserLevel(!query->value(13).isNull(), query->value(14).toInt()));
     }
 
     rc.setResponseExtension(re);
     return Response::RespOk;
 }
 
-Response::ResponseCode AbstractServerSocketInterface::cmdReportReopen(const Command_ReportReopen &cmd,
-                                                                      ResponseContainer & /*rc*/)
-{
-    if (!sqlInterface->checkSql()) {
-        return Response::RespInternalError;
-    }
-
-    int reportId = cmd.report_id();
-    QString note = textFromStdString(cmd.reopen_note());
-
-    QSqlQuery *query = sqlInterface->prepareQuery("UPDATE {prefix}_reports "
-                                                  "SET status = 'open', resolution_note = NULL, "
-                                                  "resolution_time = NULL, resolved_by = NULL, assigned_to = NULL, "
-                                                  "notified = 0 "
-                                                  "WHERE id = :id AND status IN ('resolved', 'dismissed')");
-
-    query->bindValue(":id", reportId);
-
-    if (!sqlInterface->execSqlQuery(query)) {
-        return Response::RespInternalError;
-    }
-
-    if (query->numRowsAffected() == 0) {
-        return Response::RespInvalidData;
-    }
-
-    QString auditDetails = QString("Report #%1 reopened").arg(reportId);
-    if (!note.isEmpty()) {
-        auditDetails += QString(". Reason: %1").arg(note.left(200));
-    }
-    sqlInterface->addAuditRecord(QString::number(reportId), this->getAddress(),
-                                 QString::fromStdString(userInfo->clientid()), "REPORT_REOPENED", auditDetails, true);
-
-    return Response::RespOk;
-}
-
 Response::ResponseCode AbstractServerSocketInterface::cmdReportDetails(const Command_ReportDetails &cmd,
                                                                        ResponseContainer &rc)
 {
@@ -2883,19 +2763,17 @@ Response::ResponseCode AbstractServerSocketInterface::cmdReportDetails(const Com
 
     // Columns: 0=id, 1=reporter_id, 2=reporter_name, 3=reported_user_name, 4=game_id,
     //          5=category, 6=description, 7=created_at, 8=status,
-    //          9=resolution_note, 10=assigned_mod_name, 11=resolved_by_name,
-    //          12=chat_log, 13=room_id, 14=resolution_time, 15=replay_id
-    QString queryStr =
-        "SELECT r.id, r.reporter_id, r.reporter_name, r.reported_user_name, r.game_id, "
-        "r.category, r.description, r.created_at, r.status, "
-        "r.resolution_note, u.name AS assigned_mod_name, ru.name AS resolved_by_name, r.chat_log, r.room_id, "
-        "r.resolution_time, "
-        "(SELECT id FROM {prefix}_replays WHERE id_game = r.game_id ORDER BY id DESC LIMIT 1) "
-        "AS replay_id "
-        "FROM {prefix}_reports r "
-        "LEFT JOIN {prefix}_users u ON r.assigned_to = u.id "
-        "LEFT JOIN {prefix}_users ru ON r.resolved_by = ru.id "
-        "WHERE r.id = :id";
+    //          9=resolution_note, 10=assigned_mod_name, 11=chat_log,
+    //          12=room_id, 13=resolution_time, 14=replay_id
+    QString queryStr = "SELECT r.id, r.reporter_id, r.reporter_name, r.reported_user_name, r.game_id, "
+                       "r.category, r.description, r.created_at, r.status, "
+                       "r.resolution_note, u.name AS assigned_mod_name, r.chat_log, r.room_id, "
+                       "r.resolution_time, "
+                       "(SELECT id FROM {prefix}_replays WHERE id_game = r.game_id ORDER BY id DESC LIMIT 1) "
+                       "AS replay_id "
+                       "FROM {prefix}_reports r "
+                       "LEFT JOIN {prefix}_users u ON r.assigned_to = u.id "
+                       "WHERE r.id = :id";
     QSqlQuery *query = sqlInterface->prepareQuery(queryStr);
     query->bindValue(":id", reportId);
 
@@ -2934,24 +2812,21 @@ Response::ResponseCode AbstractServerSocketInterface::cmdReportDetails(const Com
     if (!query->value(10).isNull()) {
         info->set_assigned_mod_name(query->value(10).toString().toStdString());
     }
+
     if (!query->value(11).isNull()) {
-        info->set_resolved_by_name(query->value(11).toString().toStdString());
+        info->set_chat_log(query->value(11).toString().toStdString());
     }
 
     if (!query->value(12).isNull()) {
-        info->set_chat_log(query->value(12).toString().toStdString());
+        info->set_room_id(query->value(12).toInt());
     }
 
     if (!query->value(13).isNull()) {
-        info->set_room_id(query->value(13).toInt());
+        info->set_resolution_time(query->value(13).toDateTime().toSecsSinceEpoch());
     }
 
     if (!query->value(14).isNull()) {
-        info->set_resolution_time(query->value(14).toDateTime().toSecsSinceEpoch());
-    }
-
-    if (!query->value(15).isNull()) {
-        info->set_replay_id(query->value(15).toInt());
+        info->set_replay_id(query->value(14).toInt());
     }
 
     QSqlQuery *commentQuery =
@@ -4311,21 +4186,13 @@ void TcpServerSocketInterface::readClient()
                                 (((quint32)(unsigned char)inputBuffer[1]) << 16) +
                                 (((quint32)(unsigned char)inputBuffer[2]) << 8) +
                                 ((quint32)(unsigned char)inputBuffer[3]);
-                // Reject implausible lengths instead of buffering until they arrive.
-                // This also handles lengths that overflow into negative int values.
-                if (messageLength < 0 || messageLength > MAX_TCP_MESSAGE_SIZE) {
-                    qCWarning(TcpServerSocketInterfaceLog)
-                        << "Invalid message length" << messageLength << "from" << getAddress();
-                    prepareDestroy();
-                    return;
-                }
                 inputBuffer.remove(0, 4);
                 messageInProgress = true;
             } else {
                 return;
             }
         }
-        if (inputBuffer.size() < messageLength) {
+        if (inputBuffer.size() < messageLength || messageLength < 0) {
             return;
         }
 
@@ -4431,15 +4298,10 @@ void WebsocketServerSocketInterface::initConnection(void *_socket)
 
     QByteArray websocketIPHeader = settingsCache->value("server/web_socket_ip_header", "").toByteArray();
     if (websocketIPHeader.length() > 0 && socket->request().hasRawHeader(websocketIPHeader)) {
-        // Only trust the forwarded header if the connection itself comes from a trusted proxy,
-        // otherwise a client could spoof its address to bypass bans and rate limits.
-        QString trustedSources = settingsCache->value("security/trusted_sources", "127.0.0.1,::1").toString();
-        if (trustedSources.contains(socket->peerAddress().toString(), Qt::CaseInsensitive)) {
-            QString header(socket->request().rawHeader(websocketIPHeader));
-            QHostAddress parsed(header);
-            if (!parsed.isNull()) {
-                address = parsed;
-            }
+        QString header(socket->request().rawHeader(websocketIPHeader));
+        QHostAddress parsed(header);
+        if (!parsed.isNull()) {
+            address = parsed;
         }
     }
 
diff --git a/servatrice/src/serversocketinterface.h b/servatrice/src/serversocketinterface.h
index 7de742c66..36b900d28 100644
--- a/servatrice/src/serversocketinterface.h
+++ b/servatrice/src/serversocketinterface.h
@@ -20,26 +20,28 @@
 #ifndef SERVERSOCKETINTERFACE_H
 #define SERVERSOCKETINTERFACE_H
 
-#include "libcockatrice/protocol/pb/response.pb.h"
-#include "libcockatrice/protocol/pb/server_message.pb.h"
-
-#include <QAbstractSocket>
-#include <QByteArray>
 #include <QHostAddress>
-#include <QList>
 #include <QMutex>
-#include <QString>
-#include <QStringList>
 #include <QTcpSocket>
 #include <QWebSocket>
-#include <QtGlobal>
-#include <qtmetamacros.h>
+#include <libcockatrice/protocol/pb/command_get_server_stats.pb.h>
+#include <libcockatrice/protocol/pb/command_replay_download_by_game_id.pb.h>
+#include <libcockatrice/protocol/pb/command_report.pb.h>
+#include <libcockatrice/protocol/pb/command_report_add_comment.pb.h>
+#include <libcockatrice/protocol/pb/command_report_assign.pb.h>
+#include <libcockatrice/protocol/pb/command_report_details.pb.h>
+#include <libcockatrice/protocol/pb/command_report_list.pb.h>
+#include <libcockatrice/protocol/pb/command_report_my_list.pb.h>
+#include <libcockatrice/protocol/pb/command_report_resolve.pb.h>
+#include <libcockatrice/protocol/pb/command_report_stats.pb.h>
+#include <libcockatrice/protocol/pb/command_report_user_info.pb.h>
 #include <server_protocolhandler.h>
 
 class Servatrice;
 class Servatrice_DatabaseInterface;
 class DeckList;
 class ServerInfo_DeckStorage_Folder;
+
 class Command_AddToList;
 class Command_RemoveFromList;
 class Command_DeckList;
@@ -62,52 +64,16 @@ class Command_ReplayModifyMatch;
 class Command_ReplayDeleteMatch;
 class Command_ReplayGetCode;
 class Command_ReplaySubmitCode;
+
 class Command_BanFromServer;
 class Command_UpdateServerMessage;
 class Command_ShutdownServer;
 class Command_ReloadConfig;
 class Command_ReplayDownloadByGameId;
+
 class Command_AccountEdit;
 class Command_AccountImage;
 class Command_AccountPassword;
-class Command_Activate;
-class Command_AddCardArtRule;
-class Command_AdjustMod;
-class Command_ForceActivateUser;
-class Command_ForgotPasswordChallenge;
-class Command_ForgotPasswordRequest;
-class Command_ForgotPasswordReset;
-class Command_GetAdminNotes;
-class Command_GetBanHistory;
-class Command_GetModeratorLastLogins;
-class Command_GetServerStats;
-class Command_GetUserAlts;
-class Command_GetUserSessions;
-class Command_GetWarnHistory;
-class Command_GetWarnList;
-class Command_GrantReplayAccess;
-class Command_ListCardArtRules;
-class Command_Register;
-class Command_RemoveCardArtRule;
-class Command_RemoveUserAvatar;
-class Command_Report;
-class Command_ReportAddComment;
-class Command_ReportAssign;
-class Command_ReportDetails;
-class Command_ReportList;
-class Command_ReportMyList;
-class Command_ReportReopen;
-class Command_ReportResolve;
-class Command_ReportStats;
-class Command_ReportUserInfo;
-class Command_RequestPasswordSalt;
-class Command_ResetUserPassword;
-class Command_SetCardArtParams;
-class Command_UpdateAdminNotes;
-class Command_ViewLogHistory;
-class Command_WarnUser;
-class QObject;
-class ResponseContainer;
 
 class AbstractServerSocketInterface : public Server_ProtocolHandler
 {
@@ -182,7 +148,6 @@ private:
     Response::ResponseCode cmdUpdateServerMessage(const Command_UpdateServerMessage &cmd, ResponseContainer &rc);
     Response::ResponseCode cmdReportAssign(const Command_ReportAssign &cmd, ResponseContainer &);
     Response::ResponseCode cmdReportResolve(const Command_ReportResolve &cmd, ResponseContainer &);
-    Response::ResponseCode cmdReportReopen(const Command_ReportReopen &cmd, ResponseContainer &);
     Response::ResponseCode cmdReportUserInfo(const Command_ReportUserInfo &cmd, ResponseContainer &rc);
     Response::ResponseCode cmdReportStats(const Command_ReportStats &cmd, ResponseContainer &rc);
     Response::ResponseCode cmdRegisterAccount(const Command_Register &cmd, ResponseContainer &rc);
diff --git a/servatrice/src/settingscache.cpp b/servatrice/src/settingscache.cpp
index 4ecac7319..f6c862904 100644
--- a/servatrice/src/settingscache.cpp
+++ b/servatrice/src/settingscache.cpp
@@ -4,13 +4,6 @@
 #include <QDebug>
 #include <QFile>
 #include <QStandardPaths>
-#include <QStringList>
-#include <QVariant>
-#include <qlogging.h>
-#include <qnamespace.h>
-#include <qsystemdetection.h>
-
-class QObject;
 
 SettingsCache::SettingsCache(const QString &fileName, QSettings::Format format, QObject *parent)
     : QSettings(fileName, format, parent)
diff --git a/servatrice/src/settingscache.h b/servatrice/src/settingscache.h
index 817a62bfa..6922d3508 100644
--- a/servatrice/src/settingscache.h
+++ b/servatrice/src/settingscache.h
@@ -5,9 +5,6 @@
 #include <QRegularExpression>
 #include <QSettings>
 #include <QString>
-#include <qtmetamacros.h>
-
-class QObject;
 
 class SettingsCache : public QSettings
 {
diff --git a/servatrice/src/signalhandler.cpp b/servatrice/src/signalhandler.cpp
index 32cd5b206..b4513979f 100644
--- a/servatrice/src/signalhandler.cpp
+++ b/servatrice/src/signalhandler.cpp
@@ -5,10 +5,6 @@
 #include "settingscache.h"
 
 #include <QSocketNotifier>
-#include <QThread>
-#include <QtGlobal>
-#include <qobjectdefs.h>
-#include <qsystemdetection.h>
 
 #ifdef Q_OS_UNIX
 #include <cstdio>
diff --git a/servatrice/src/signalhandler.h b/servatrice/src/signalhandler.h
index 82652a43a..bf8d9e52a 100644
--- a/servatrice/src/signalhandler.h
+++ b/servatrice/src/signalhandler.h
@@ -2,7 +2,6 @@
 #define SIGNALHANDLER_H
 
 #include <QObject>
-#include <qtmetamacros.h>
 
 class QSocketNotifier;
 
diff --git a/servatrice/src/smtp/qxtsmtp.cpp b/servatrice/src/smtp/qxtsmtp.cpp
index a4da649f7..c81e0955c 100644
--- a/servatrice/src/smtp/qxtsmtp.cpp
+++ b/servatrice/src/smtp/qxtsmtp.cpp
@@ -94,38 +94,6 @@ int QxtSmtp::pendingMessages() const
     return qxt_d().pending.count();
 }
 
-/*!
- * \brief Drops all queued (not yet transmitted) messages without sending them.
- *
- * Any message still awaiting delivery is discarded. This is used by callers that
- * keep their own authoritative queue and wish to rebuild the SMTP buffer from scratch
- * (e.g. after a reconnect) without risking duplicates.
- */
-void QxtSmtp::clearPending()
-{
-    qxt_d().pending.clear();
-}
-
-/*!
- * \brief Clears the outgoing queue and resets the SMTP state machine.
- *
- * Unlike clearPending(), this also resets the internal state to Disconnected so
- * that subsequent send() calls will not fire sendNext() prematurely on a
- * not-yet-connected socket.  Use this when rebuilding the queue from scratch
- * before a fresh connectToHost() / connectToSecureHost() cycle.
- */
-void QxtSmtp::reset()
-{
-    qxt_d().pending.clear();
-    qxt_d().extensions.clear();
-    qxt_d().buffer.clear();
-    qxt_d().recipients.clear();
-    qxt_d().rcptNumber = 0;
-    qxt_d().rcptAck = 0;
-    qxt_d().mailAck = false;
-    qxt_d().state = QxtSmtpPrivate::Disconnected;
-}
-
 QTcpSocket *QxtSmtp::socket() const
 {
     return qxt_d().socket;
diff --git a/servatrice/src/smtp/qxtsmtp.h b/servatrice/src/smtp/qxtsmtp.h
index d264d1047..747e22df9 100644
--- a/servatrice/src/smtp/qxtsmtp.h
+++ b/servatrice/src/smtp/qxtsmtp.h
@@ -66,8 +66,6 @@ public:
 
     int send(const QxtMailMessage& message);
     int pendingMessages() const;
-    void clearPending();
-    void reset();
 
     QTcpSocket* socket() const;
     void connectToHost(const QString& hostName, quint16 port = 25);
diff --git a/servatrice/src/smtpclient.cpp b/servatrice/src/smtpclient.cpp
index 82824e496..3ec333413 100644
--- a/servatrice/src/smtpclient.cpp
+++ b/servatrice/src/smtpclient.cpp
@@ -1,62 +1,15 @@
 #include "smtpclient.h"
 
 #include "settingscache.h"
-#include "smtp/qxtmailmessage.h"
 #include "smtp/qxtsmtp.h"
 
-#include <QAbstractSocket>
-#include <QByteArray>
-#include <QDebug>
-#include <QLoggingCategory>
-#include <QSharedPointer>
 #include <QSslSocket>
-#include <QString>
 #include <QTcpSocket>
-#include <QVariant>
-#include <qlogging.h>
-#include <qobjectdefs.h>
-
-static const qint64 DEFAULT_MAX_RETRIES = 5;
-static const qint64 DEFAULT_RETRY_DELAY = 60;
-static const qint64 MAX_RETRY_DELAY = 1800;  // 30 minutes
-static const qint64 IDLE_TIMEOUT_MS = 60000; // 60 seconds
-// Maximum bit-shift exponent used in the exponential back-off formula.
-// With a base delay of 60 s, shift 10 gives 60 * 1024 ≈ 17 h before the
-// MAX_RETRY_DELAY cap is applied, preventing unbounded intermediate values.
-static const int MAX_BACKOFF_SHIFT = 10;
-
-inline Q_LOGGING_CATEGORY(SmtpClientLog, "smtp_client")
-
-static QString pendingKey(const QString &userName, EmailType type, const QString &token)
-{
-    const char *typeName = (type == EmailType::Activation) ? "activation" : "forgotpassword";
-    // The token is part of the key: a regenerated token (forgot-password issues a
-    // fresh one per request) must not be suppressed by a stale pending entry.
-    return userName + '/' + typeName + '/' + token;
-}
-
-// True only for permanent 5xx replies. Anything else (4xx greylisting/rate
-// limiting, or an unparsable reply) must be retried, never treated as final:
-// destroying the durable queue row on a transient failure loses the mail.
-static bool isPermanentSmtpReply(const QByteArray &msg)
-{
-    for (char c : msg) {
-        if (c == ' ' || c == '\t' || c == '\r' || c == '\n' || c == '-') {
-            continue;
-        }
-        return c == '5';
-    }
-    return false;
-}
 
 SmtpClient::SmtpClient(QObject *parent) : QObject(parent)
 {
     smtp = new QxtSmtp(this);
 
-    idleTimer = new QTimer(this);
-    idleTimer->setSingleShot(true);
-    connect(idleTimer, SIGNAL(timeout()), this, SLOT(idleTimeout()));
-
     connect(smtp, SIGNAL(authenticated()), this, SLOT(authenticated()));
     connect(smtp, SIGNAL(authenticationFailed(const QByteArray &)), this,
             SLOT(authenticationFailed(const QByteArray &)));
@@ -79,151 +32,104 @@ SmtpClient::~SmtpClient()
 {
     if (smtp) {
         delete smtp;
-        smtp = nullptr;
+        smtp = 0;
     }
 }
 
-int SmtpClient::maxRetries() const
-{
-    // Bounded like retryDelaySeconds(): an unset/blank value must not turn the
-    // first transient failure into a permanent one (attempts >= 0 is immediate).
-    return qBound(1, settingsCache->value("smtp/maxretries", DEFAULT_MAX_RETRIES).toInt(), 100);
-}
-
-int SmtpClient::retryDelaySeconds() const
-{
-    return qBound(1, settingsCache->value("smtp/retrydelay", DEFAULT_RETRY_DELAY).toInt(),
-                  static_cast<int>(MAX_RETRY_DELAY));
-}
-
-QDateTime SmtpClient::nextRetryTime(int attempts, int retryDelay) const
-{
-    // Exponential backoff, capped to avoid hammering an unreachable server.
-    const int shift = qMax(0, qMin(attempts - 1, MAX_BACKOFF_SHIFT));
-    const qint64 delay = qMin<qint64>(retryDelay * qint64(1) << shift, MAX_RETRY_DELAY);
-    return QDateTime::currentDateTime().addSecs(delay);
-}
-
-SmtpClient::PendingEmail SmtpClient::buildEmail(const QString &nickname,
-                                                EmailType type,
-                                                const QString &subject,
-                                                const QString &body,
-                                                const QString &recipient,
-                                                const QString &token,
-                                                const QString &email,
-                                                qint64 rowId)
-{
-    QString name = settingsCache->value("smtp/name", "").toString();
-
-    PendingEmail pending;
-    pending.userName = nickname;
-    pending.type = type;
-    pending.token = token;
-    pending.rowId = rowId;
-    pending.maxAttempts = maxRetries();
-    pending.retryDelay = retryDelaySeconds();
-    pending.nextAttempt = QDateTime::currentDateTime();
-
-    QString emailBody = body;
-    emailBody.replace("%username", nickname).replace("%token", token);
-
-    pending.message.setSender(name + " <" + email + ">");
-    pending.message.addRecipient(recipient);
-    pending.message.setSubject(subject);
-    pending.message.setBody(emailBody);
-
-    return pending;
-}
-
-bool SmtpClient::enqueue(const PendingEmail &email)
-{
-    const QString key = pendingKey(email.userName, email.type, email.token);
-    if (pendingEmails.contains(key)) {
-        qCDebug(SmtpClientLog) << "Email already pending for" << email.userName << "- not duplicating";
-        return false;
-    }
-
-    // A fresher database row for the same user/type supersedes a stale pending
-    // entry: drop the stale one so only the current token is ever delivered.
-    // (Any in-flight mapping for the dropped key is removed as well; the
-    // mailSent/recordFailed lookups tolerate missing entries.)
-    for (auto it = pendingEmails.begin(); it != pendingEmails.end();) {
-        if (it.value().userName == email.userName && it.value().type == email.type) {
-            for (auto mapIt = mailIdToUser.begin(); mapIt != mailIdToUser.end();) {
-                if (mapIt.value() == it.key()) {
-                    mapIt = mailIdToUser.erase(mapIt);
-                } else {
-                    ++mapIt;
-                }
-            }
-            qCDebug(SmtpClientLog) << "Replacing stale pending email for" << email.userName;
-            it = pendingEmails.erase(it);
-        } else {
-            ++it;
-        }
-    }
-
-    pendingEmails.insert(key, email);
-    qCDebug(SmtpClientLog) << "Enqueued" << (email.type == EmailType::Activation ? "activation" : "password reset")
-                           << "mail to" << email.userName;
-    return true;
-}
-
 bool SmtpClient::enqueueActivationTokenMail(const QString &nickname, const QString &recipient, const QString &token)
 {
-    if (pendingEmails.contains(pendingKey(nickname, EmailType::Activation, token))) {
-        qCDebug(SmtpClientLog) << "Activation email already pending for" << nickname << "- skipping";
-        return false;
-    }
-
+    QString email = settingsCache->value("smtp/email", "").toString();
+    QString name = settingsCache->value("smtp/name", "").toString();
     QString subject = settingsCache->value("smtp/subject", "").toString();
     QString body = settingsCache->value("smtp/body", "").toString();
-    QString email = settingsCache->value("smtp/email", "").toString();
 
-    if (!validateEmailFields(email, subject, body, recipient, token, nickname)) {
+    if (email.isEmpty()) {
+        qDebug() << "[MAIL] Missing sender email in configuration";
         return false;
     }
 
-    return enqueue(buildEmail(nickname, EmailType::Activation, subject, body, recipient, token, email));
+    if (subject.isEmpty()) {
+        qDebug() << "[MAIL] Missing subject field in configuration";
+        return false;
+    }
+
+    if (body.isEmpty()) {
+        qDebug() << "[MAIL] Missing body field in configuration";
+        return false;
+    }
+
+    if (recipient.isEmpty()) {
+        qDebug() << "[MAIL] Missing recipient field for user " << nickname;
+        return false;
+    }
+
+    if (token.isEmpty()) {
+        qDebug() << "[MAIL] Missing token field for user " << nickname;
+        return false;
+    }
+
+    QxtMailMessage message;
+    message.setSender(name + " <" + email + ">");
+    message.addRecipient(recipient);
+    message.setSubject(subject);
+    message.setBody(body.replace("%username", nickname).replace("%token", token));
+
+    int id = smtp->send(message);
+    qDebug() << "[MAIL] Enqueued mail to" << recipient << "as" << id;
+    return true;
 }
 
-bool SmtpClient::enqueueForgotPasswordTokenMail(const QString &nickname,
-                                                const QString &recipient,
-                                                const QString &token,
-                                                qint64 rowId)
+bool SmtpClient::enqueueForgotPasswordTokenMail(const QString &nickname, const QString &recipient, const QString &token)
 {
-    if (pendingEmails.contains(pendingKey(nickname, EmailType::ForgotPassword, token))) {
-        qCDebug(SmtpClientLog) << "Password reset email already pending for" << nickname << "- skipping";
-        return false;
-    }
-
+    QString email = settingsCache->value("smtp/email", "").toString();
+    QString name = settingsCache->value("smtp/name", "").toString();
     QString subject = settingsCache->value("forgotpassword/subject", "").toString();
     QString body = settingsCache->value("forgotpassword/body", "").toString();
-    QString email = settingsCache->value("smtp/email", "").toString();
 
-    if (!validateEmailFields(email, subject, body, recipient, token, nickname)) {
+    if (email.isEmpty()) {
+        qDebug() << "[MAIL] Missing sender email in configuration";
         return false;
     }
 
-    return enqueue(buildEmail(nickname, EmailType::ForgotPassword, subject, body, recipient, token, email, rowId));
+    if (subject.isEmpty()) {
+        qDebug() << "[MAIL] Missing subject field in configuration";
+        return false;
+    }
+
+    if (body.isEmpty()) {
+        qDebug() << "[MAIL] Missing body field in configuration";
+        return false;
+    }
+
+    if (recipient.isEmpty()) {
+        qDebug() << "[MAIL] Missing recipient field for user " << nickname;
+        return false;
+    }
+
+    if (token.isEmpty()) {
+        qDebug() << "[MAIL] Missing token field for user " << nickname;
+        return false;
+    }
+
+    QxtMailMessage message;
+    message.setSender(name + " <" + email + ">");
+    message.addRecipient(recipient);
+    message.setSubject(subject);
+    message.setBody(body.replace("%username", nickname).replace("%token", token));
+
+    int id = smtp->send(message);
+    qDebug() << "[MAIL] Enqueued mail to" << recipient << "as" << id;
+    return true;
 }
 
 void SmtpClient::sendAllEmails()
 {
     // still connected from the previous round
-    if (smtp->socket()->state() == QAbstractSocket::ConnectedState ||
-        smtp->socket()->state() == QAbstractSocket::ConnectingState ||
-        smtp->socket()->state() == QAbstractSocket::HostLookupState ||
-        smtp->socket()->state() == QAbstractSocket::ClosingState) {
+    if (smtp->socket()->state() == QAbstractSocket::ConnectedState) {
         return;
     }
 
-    if (pendingEmails.isEmpty()) {
-        return;
-    }
-
-    // Respect connection-level backoff after auth/conn/encryption failures.
-    if (connectionAttempts > 0 && QDateTime::currentDateTime() < connectionBackoffUntil) {
+    if (smtp->pendingMessages() == 0) {
         return;
     }
 
@@ -237,16 +143,6 @@ void SmtpClient::sendAllEmails()
     smtp->setUsername(username);
     smtp->setPassword(password);
 
-    // Push due emails into QxtSmtp *before* connecting so they are already
-    // queued when the authenticated() signal fires and QxtSmtp's internal
-    // sendNext() runs.
-    relayoutForSending();
-
-    // Nothing due right now — skip the SMTP round-trip.
-    if (mailIdToUser.isEmpty()) {
-        return;
-    }
-
     // Connect
     if (connectionType == "ssl") {
         if (acceptAllCerts) {
@@ -258,286 +154,64 @@ void SmtpClient::sendAllEmails()
     }
 }
 
-void SmtpClient::relayoutForSending()
-{
-    // Rebuild the SMTP buffer exclusively from our authoritative set, so a reconnect
-    // after a partial transmission never results in duplicate deliveries.
-    // reset() also clears the internal state machine so that send() does not
-    // fire sendNext() prematurely on a not-yet-connected socket.
-    smtp->reset();
-    mailIdToUser.clear();
-
-    const QDateTime now = QDateTime::currentDateTime();
-    for (auto it = pendingEmails.begin(); it != pendingEmails.end(); ++it) {
-        PendingEmail &pending = it.value();
-        if (pending.nextAttempt > now) {
-            continue; // not yet due; honours the backoff schedule
-        }
-        int id = smtp->send(pending.message);
-        mailIdToUser.insert(id, pendingKey(pending.userName, pending.type, pending.token));
-    }
-}
-
-void SmtpClient::finished()
-{
-    qCDebug(SmtpClientLog) << "finished";
-    smtp->disconnectFromHost();
-}
-
 void SmtpClient::authenticated()
 {
-    qCDebug(SmtpClientLog) << "authenticated";
-    // The session has actually succeeded (TCP connect alone proves nothing:
-    // TLS/auth may still fail), so the connection-level backoff resets here.
-    connectionAttempts = 0;
-    // Start the idle timer here, once the connection is fully ready to send,
-    // rather than on TCP connect: SSL/STARTTLS handshake and auth may take a
-    // while and must not be cut short by the idle timeout.
-    idleTimer->start(IDLE_TIMEOUT_MS);
+    qDebug() << "[MAIL] authenticated";
 }
 
 void SmtpClient::authenticationFailed(const QByteArray &msg)
 {
-    qCWarning(SmtpClientLog) << "authenticationFailed" << QString::fromUtf8(msg);
-    idleTimer->stop();
-    recordConnectionFailure();
-    mailIdToUser.clear();
-    smtp->disconnectFromHost();
+    qDebug() << "[MAIL] authenticationFailed" << QString(msg);
 }
 
 void SmtpClient::connected()
 {
-    qCDebug(SmtpClientLog) << "connected";
-    // NOTE: connectionAttempts is deliberately not reset here. This fires on
-    // TCP connect, before the TLS handshake and AUTH; resetting here would pin
-    // the connection-level backoff at its base delay for exactly the failures
-    // (bad password/cert/STARTTLS) it is meant to cover. It resets in
-    // authenticated() and on the first successful mailSent instead.
+    qDebug() << "[MAIL] connected";
 }
 
 void SmtpClient::connectionFailed(const QByteArray &msg)
 {
-    qCWarning(SmtpClientLog) << "connectionFailed" << QString::fromUtf8(msg);
-    idleTimer->stop();
-    recordConnectionFailure();
-    mailIdToUser.clear();
-    smtp->disconnectFromHost();
+    qDebug() << "[MAIL] connectionFailed" << QString(msg);
 }
 
 void SmtpClient::disconnected()
 {
-    qCDebug(SmtpClientLog) << "disconnected - emails still pending:" << pendingEmails.count();
-    idleTimer->stop();
-    // A mid-session drop (peer close/RST past the connect phase, or the idle
-    // timeout firing mid-batch) emits no mailFailed/connectionFailed signal, so
-    // route every in-flight mail through recordFailed(): otherwise attempts and
-    // backoff are bypassed and the mails requeue with stale state forever.
-    const QList<int> inFlight = mailIdToUser.keys();
-    for (int mailID : inFlight) {
-        recordFailed(mailID);
-    }
-    mailIdToUser.clear();
+    qDebug() << "[MAIL] disconnected";
 }
 
 void SmtpClient::encrypted()
 {
-    qCDebug(SmtpClientLog) << "encrypted";
+    qDebug() << "[MAIL] encrypted";
 }
 
 void SmtpClient::encryptionFailed(const QByteArray &msg)
 {
-    qCWarning(SmtpClientLog) << "encryptionFailed" << QString::fromUtf8(msg);
-    qCWarning(SmtpClientLog) << "Try enabling the \"acceptallcerts\" option in servatrice.ini";
-    idleTimer->stop();
-    recordConnectionFailure();
-    mailIdToUser.clear();
+    qDebug() << "[MAIL] encryptionFailed" << QString(msg);
+    qDebug() << "[MAIL] Try enabling the \"acceptallcerts\" option in servatrice.ini";
+}
+
+void SmtpClient::finished()
+{
+    qDebug() << "[MAIL] finished";
     smtp->disconnectFromHost();
 }
 
-void SmtpClient::idleTimeout()
-{
-    qCDebug(SmtpClientLog) << "idle timeout - disconnecting";
-    smtp->disconnectFromHost();
-}
-
-void SmtpClient::recordFailed(int mailID)
-{
-    auto it = mailIdToUser.find(mailID);
-    if (it == mailIdToUser.end()) {
-        return;
-    }
-    const QString key = it.value();
-    mailIdToUser.erase(it);
-
-    auto pendingIt = pendingEmails.find(key);
-    if (pendingIt == pendingEmails.end()) {
-        return;
-    }
-
-    PendingEmail &pending = pendingIt.value();
-    pending.attempts++;
-
-    if (pending.attempts >= pending.maxAttempts) {
-        const QString userName = pending.userName;
-        const EmailType type = pending.type;
-        const QString token = pending.token;
-        const qint64 rowId = pending.rowId;
-        qCWarning(SmtpClientLog) << "Email to" << userName << "permanently failed after" << pending.attempts
-                                 << "attempts - dropping from pending set";
-        pendingEmails.erase(pendingIt);
-        emit mailPermanentlyFailed(userName, type, FailureReason::RetryExhausted, token, rowId);
-        return;
-    }
-
-    pending.nextAttempt = nextRetryTime(pending.attempts, pending.retryDelay);
-    qCWarning(SmtpClientLog) << "Email to" << pending.userName << "failed (attempt" << pending.attempts << "of"
-                             << pending.maxAttempts << "), retrying" << pending.nextAttempt.toString(Qt::ISODate);
-}
-
-void SmtpClient::recordConnectionFailure()
-{
-    ++connectionAttempts;
-    connectionBackoffUntil = nextRetryTime(connectionAttempts, retryDelaySeconds());
-    qCWarning(SmtpClientLog) << "Connection-layer failure #" << connectionAttempts << "- next attempt after"
-                             << connectionBackoffUntil.toString(Qt::ISODate);
-
-    // Connection failures count toward the per-email retry budget so that
-    // undeliverable mail eventually gives up rather than retrying forever.
-    QList<QString> keysToRemove;
-    for (auto it = pendingEmails.begin(); it != pendingEmails.end(); ++it) {
-        PendingEmail &pending = it.value();
-        pending.attempts++;
-        if (pending.attempts >= pending.maxAttempts) {
-            qCWarning(SmtpClientLog) << "Email to" << pending.userName << "permanently failed after" << pending.attempts
-                                     << "connection failures - dropping from pending set";
-            keysToRemove.append(it.key());
-            emit mailPermanentlyFailed(pending.userName, pending.type, FailureReason::RetryExhausted, pending.token,
-                                       pending.rowId);
-        }
-    }
-    for (const QString &key : keysToRemove) {
-        pendingEmails.remove(key);
-    }
-}
-
-bool SmtpClient::validateEmailFields(const QString &email,
-                                     const QString &subject,
-                                     const QString &body,
-                                     const QString &recipient,
-                                     const QString &token,
-                                     const QString &nickname)
-{
-    if (email.isEmpty()) {
-        qCCritical(SmtpClientLog) << "Missing sender email in configuration";
-        return false;
-    }
-    if (subject.isEmpty()) {
-        qCCritical(SmtpClientLog) << "Missing subject field in configuration";
-        return false;
-    }
-    if (body.isEmpty()) {
-        qCCritical(SmtpClientLog) << "Missing body field in configuration";
-        return false;
-    }
-    if (recipient.isEmpty()) {
-        qCCritical(SmtpClientLog) << "Missing recipient field for user" << nickname;
-        return false;
-    }
-    if (token.isEmpty()) {
-        qCCritical(SmtpClientLog) << "Missing token field for user" << nickname;
-        return false;
-    }
-    return true;
-}
-
 void SmtpClient::mailFailed(int mailID, int errorCode, const QByteArray &msg)
 {
-    qCWarning(SmtpClientLog) << "mailFailed id=" << mailID << " errorCode=" << errorCode
-                             << "msg=" << QString::fromUtf8(msg);
-    // Progress was made (the server answered), so the idle timer measures from
-    // here rather than acting as a cap on the whole session.
-    idleTimer->start(IDLE_TIMEOUT_MS);
-    recordFailed(mailID);
+    qDebug() << "[MAIL] mailFailed id=" << mailID << " errorCode=" << errorCode << "msg=" << QString(msg);
 }
 
 void SmtpClient::mailSent(int mailID)
 {
-    qCDebug(SmtpClientLog) << "mailSent" << mailID;
-    // A delivered mail proves the session works: reset the connection-level
-    // backoff and restart the idle timer from this point of progress.
-    connectionAttempts = 0;
-    idleTimer->start(IDLE_TIMEOUT_MS);
-
-    auto it = mailIdToUser.find(mailID);
-    if (it == mailIdToUser.end()) {
-        return;
-    }
-    const QString key = it.value();
-    mailIdToUser.erase(it);
-
-    auto pendingIt = pendingEmails.find(key);
-    if (pendingIt == pendingEmails.end()) {
-        return;
-    }
-
-    const QString userName = pendingIt.value().userName;
-    const EmailType type = pendingIt.value().type;
-    const QString token = pendingIt.value().token;
-    const qint64 rowId = pendingIt.value().rowId;
-    pendingEmails.erase(pendingIt);
-    qCDebug(SmtpClientLog) << "Delivered email to" << userName;
-    emit mailDelivered(userName, type, token, rowId);
+    qDebug() << "[MAIL] mailSent" << mailID;
 }
 
 void SmtpClient::recipientRejected(int mailID, const QString &address, const QByteArray &msg)
 {
-    qCWarning(SmtpClientLog) << "recipientRejected id=" << mailID << " address=" << address
-                             << "msg=" << QString::fromUtf8(msg);
-    if (!isPermanentSmtpReply(msg)) {
-        // Transient 4xx (e.g. greylisting): consume one attempt and reschedule
-        // with backoff instead of destroying the durable queue row.
-        recordFailed(mailID);
-        return;
-    }
-    // A rejected recipient is a permanent condition; consider the mail undeliverable.
-    auto it = mailIdToUser.find(mailID);
-    if (it != mailIdToUser.end()) {
-        const QString key = it.value();
-        if (auto pendingIt = pendingEmails.find(key); pendingIt != pendingEmails.end()) {
-            const QString userName = pendingIt.value().userName;
-            const EmailType type = pendingIt.value().type;
-            const QString token = pendingIt.value().token;
-            const qint64 rowId = pendingIt.value().rowId;
-            pendingEmails.erase(pendingIt);
-            qCWarning(SmtpClientLog) << "Email to" << userName << "rejected - dropping from pending set";
-            emit mailPermanentlyFailed(userName, type, FailureReason::RecipientRejected, token, rowId);
-        }
-        mailIdToUser.erase(it);
-    }
+    qDebug() << "[MAIL] recipientRejected id=" << mailID << " address=" << address << "msg=" << QString(msg);
 }
 
 void SmtpClient::senderRejected(int mailID, const QString &address, const QByteArray &msg)
 {
-    qCWarning(SmtpClientLog) << "senderRejected id=" << mailID << " sender=" << address
-                             << "msg=" << QString::fromUtf8(msg);
-    if (!isPermanentSmtpReply(msg)) {
-        // Transient 4xx on MAIL FROM (e.g. rate limiting): retry with backoff.
-        recordFailed(mailID);
-        return;
-    }
-    // A rejected sender is a permanent condition; consider the mail undeliverable.
-    auto it = mailIdToUser.find(mailID);
-    if (it != mailIdToUser.end()) {
-        const QString key = it.value();
-        if (auto pendingIt = pendingEmails.find(key); pendingIt != pendingEmails.end()) {
-            const QString userName = pendingIt.value().userName;
-            const EmailType type = pendingIt.value().type;
-            const QString token = pendingIt.value().token;
-            const qint64 rowId = pendingIt.value().rowId;
-            pendingEmails.erase(pendingIt);
-            qCWarning(SmtpClientLog) << "Email to" << userName << "sender rejected - dropping from pending set";
-            emit mailPermanentlyFailed(userName, type, FailureReason::SenderRejected, token, rowId);
-        }
-        mailIdToUser.erase(it);
-    }
+    qDebug() << "[MAIL] senderRejected id=" << mailID << " address=" << address << "msg=" << QString(msg);
 }
diff --git a/servatrice/src/smtpclient.h b/servatrice/src/smtpclient.h
index 9fc11bf36..be97ed44d 100644
--- a/servatrice/src/smtpclient.h
+++ b/servatrice/src/smtpclient.h
@@ -1,67 +1,24 @@
 #ifndef SMTPCLIENT_H
 #define SMTPCLIENT_H
 
-#include "smtp/qxtmailmessage.h"
-
-#include <QDateTime>
-#include <QHash>
 #include <QObject>
-#include <QString>
-#include <QTimer>
-#include <qtmetamacros.h>
 
 class QxtSmtp;
-class QByteArray;
-
-/**
- * @brief Types of e-mail the SMTP client is able to deliver.
- */
-enum class EmailType
-{
-    Activation,
-    ForgotPassword
-};
-
-Q_DECLARE_METATYPE(EmailType)
-
-/**
- * @brief Why a permanent e-mail delivery failure occurred.
- */
-enum class FailureReason
-{
-    RetryExhausted,
-    RecipientRejected,
-    SenderRejected
-};
-
-Q_DECLARE_METATYPE(FailureReason)
+class QxtMailMessage;
 
 class SmtpClient : public QObject
 {
     Q_OBJECT
 public:
-    SmtpClient(QObject *parent = nullptr);
-    ~SmtpClient() override;
-
-public slots:
-    bool enqueueActivationTokenMail(const QString &nickname, const QString &recipient, const QString &token);
-    bool enqueueForgotPasswordTokenMail(const QString &nickname,
-                                        const QString &recipient,
-                                        const QString &token,
-                                        qint64 rowId = -1);
-    void sendAllEmails();
-
-signals:
-    void mailDelivered(const QString &userName, EmailType type, const QString &token, qint64 rowId);
-    void mailPermanentlyFailed(const QString &userName,
-                               EmailType type,
-                               FailureReason reason,
-                               const QString &token,
-                               qint64 rowId);
+    SmtpClient(QObject *parent = 0);
+    ~SmtpClient();
 
 protected:
     QxtSmtp *smtp;
-
+public slots:
+    bool enqueueActivationTokenMail(const QString &nickname, const QString &recipient, const QString &token);
+    bool enqueueForgotPasswordTokenMail(const QString &nickname, const QString &recipient, const QString &token);
+    void sendAllEmails();
 protected slots:
     void authenticated();
     void authenticationFailed(const QByteArray &msg);
@@ -71,55 +28,10 @@ protected slots:
     void encrypted();
     void encryptionFailed(const QByteArray &msg);
     void finished();
-    void idleTimeout();
     void mailFailed(int mailID, int errorCode, const QByteArray &msg);
     void mailSent(int mailID);
     void recipientRejected(int mailID, const QString &address, const QByteArray &msg);
     void senderRejected(int mailID, const QString &address, const QByteArray &msg);
-
-private:
-    struct PendingEmail
-    {
-        QString userName;
-        EmailType type;
-        QString token;
-        // Database row id for tables that allow multiple rows per user
-        // ({prefix}_forgot_password); -1 when the name alone identifies the row.
-        qint64 rowId = -1;
-        QxtMailMessage message;
-        int attempts = 0;
-        int maxAttempts = 0;
-        int retryDelay = 0;
-        QDateTime nextAttempt;
-    };
-
-    PendingEmail buildEmail(const QString &nickname,
-                            EmailType type,
-                            const QString &subject,
-                            const QString &body,
-                            const QString &recipient,
-                            const QString &token,
-                            const QString &email,
-                            qint64 rowId = -1);
-    bool enqueue(const PendingEmail &email);
-    void relayoutForSending();
-    QDateTime nextRetryTime(int attempts, int retryDelay) const;
-    void recordFailed(int mailID);
-    void recordConnectionFailure();
-    bool validateEmailFields(const QString &email,
-                             const QString &subject,
-                             const QString &body,
-                             const QString &recipient,
-                             const QString &token,
-                             const QString &nickname);
-    int maxRetries() const;
-    int retryDelaySeconds() const;
-
-    QHash<QString, PendingEmail> pendingEmails;
-    QHash<int, QString> mailIdToUser;
-    QTimer *idleTimer;
-    int connectionAttempts = 0;
-    QDateTime connectionBackoffUntil;
 };
 
-#endif
+#endif
\ No newline at end of file
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 9955e1189..b51d10560 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -2,10 +2,102 @@
 # If a new test needs additional Qt modules, add them there — not in individual test CMakeLists.txt files.
 enable_testing()
 
-include(GoogleTest)
+add_test(NAME dummy_test COMMAND dummy_test)
+add_test(NAME expression_test COMMAND expression_test)
+add_test(NAME clamped_arithmetic_test COMMAND clamped_arithmetic_test)
+add_test(NAME test_age_formatting COMMAND test_age_formatting)
+add_test(NAME password_hash_test COMMAND password_hash_test)
+add_test(NAME playmat_resolver_test COMMAND playmat_resolver_test)
+add_test(NAME server_card_counter_test COMMAND server_card_counter_test)
+add_test(NAME server_counter_test COMMAND server_counter_test)
+add_test(NAME server_rate_limiter_test COMMAND server_rate_limiter_test)
+add_test(NAME server_developer_role_test COMMAND server_developer_role_test)
+add_test(NAME server_game_join_test COMMAND server_game_join_test)
+add_test(NAME warning_categories_test COMMAND warning_categories_test)
+# The translation loader test compiles a .qm fixture, which needs lrelease from Qt Linguist.
+if(TARGET Qt6::lrelease)
+  add_test(NAME translation_loader_test COMMAND translation_loader_test)
+endif()
+add_test(NAME report_categories_test COMMAND report_categories_test)
+add_test(NAME lag_monitor_test COMMAND lag_monitor_test)
+add_test(NAME latency_tracker_test COMMAND latency_tracker_test)
+add_test(NAME metrics_registry_test COMMAND metrics_registry_test)
+add_test(NAME loader_local_matching_test COMMAND loader_local_matching_test)
+
+add_test(NAME deck_hash_performance_test COMMAND deck_hash_performance_test)
+set_tests_properties(deck_hash_performance_test PROPERTIES TIMEOUT 15)
 
 # Find GTest
 
+add_executable(dummy_test dummy_test.cpp)
+add_executable(expression_test expression_test.cpp)
+add_executable(clamped_arithmetic_test clamped_arithmetic_test.cpp)
+add_executable(test_age_formatting test_age_formatting.cpp)
+add_executable(password_hash_test password_hash_test.cpp)
+add_executable(playmat_resolver_test playmat_resolver_test.cpp)
+add_executable(deck_hash_performance_test deck_hash_performance_test.cpp)
+add_executable(server_card_counter_test server_card_counter_test.cpp)
+add_executable(server_counter_test server_counter_test.cpp)
+add_executable(server_rate_limiter_test server_rate_limiter_test.cpp)
+add_executable(server_developer_role_test server_developer_role_test.cpp)
+add_executable(server_game_join_test server_game_join_test.cpp)
+add_executable(warning_categories_test warning_categories_test.cpp)
+if(TARGET Qt6::lrelease)
+  add_executable(translation_loader_test translation_loader_test.cpp)
+
+  # QTranslator only accepts real .qm files, so the translation loader test gets one compiled from its
+  # own .ts fixture rather than a stub.
+  set(TRANSLATION_LOADER_TEST_QM "${CMAKE_CURRENT_BINARY_DIR}/translation_loader_test_de.qm")
+  add_custom_command(
+    OUTPUT "${TRANSLATION_LOADER_TEST_QM}"
+    COMMAND Qt6::lrelease "${CMAKE_CURRENT_SOURCE_DIR}/translation_loader_test.ts" -qm "${TRANSLATION_LOADER_TEST_QM}"
+    DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/translation_loader_test.ts"
+    COMMENT "Compiling translation_loader_test.ts"
+  )
+  add_custom_target(translation_loader_test_qm DEPENDS "${TRANSLATION_LOADER_TEST_QM}")
+  add_dependencies(translation_loader_test translation_loader_test_qm)
+  target_compile_definitions(translation_loader_test PRIVATE TRANSLATION_LOADER_TEST_DIR="${CMAKE_CURRENT_BINARY_DIR}")
+
+  # A multi-config generator (MSBuild, Xcode) puts the executable in a per-config subdirectory while
+  # the .qm stays in the current binary directory, so copy the fixture next to the binary: that is the
+  # layout ABuildTreeFindsTheTranslationsNextToTheExecutable is about, and the only one it finds on
+  # those generators.
+  add_custom_command(
+    TARGET translation_loader_test
+    POST_BUILD
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different "${TRANSLATION_LOADER_TEST_QM}"
+            "$<TARGET_FILE_DIR:translation_loader_test>/"
+    VERBATIM
+  )
+endif()
+add_executable(report_categories_test report_categories_test.cpp)
+add_executable(lag_monitor_test ${CMAKE_SOURCE_DIR}/cockatrice/src/client/lag_monitor.cpp lag_monitor_test.cpp)
+target_include_directories(lag_monitor_test PRIVATE ${CMAKE_SOURCE_DIR}/cockatrice/src)
+add_executable(latency_tracker_test latency_tracker_test.cpp)
+add_executable(metrics_registry_test ../servatrice/src/metrics_registry.cpp metrics_registry_test.cpp)
+add_executable(
+  loader_local_matching_test
+  ${CMAKE_SOURCE_DIR}/cockatrice/src/interface/card_picture_loader/card_picture_loader_local.cpp
+  ${CMAKE_SOURCE_DIR}/cockatrice/src/client/settings/cache_settings.cpp
+  ${CMAKE_SOURCE_DIR}/cockatrice/src/client/settings/card_counter_settings.cpp
+  ${CMAKE_SOURCE_DIR}/cockatrice/src/client/settings/shortcuts_settings.cpp
+  ${CMAKE_SOURCE_DIR}/cockatrice/src/client/network/update/client/release_channel.cpp
+  ${VERSION_STRING_CPP}
+  loader_local_matching_test.cpp
+)
+target_include_directories(loader_local_matching_test PRIVATE ${CMAKE_SOURCE_DIR}/cockatrice/src)
+
+# Guard must match the condition for src/single_instance_manager.cpp in cockatrice/CMakeLists.txt.
+if(WITH_CLIENT)
+  add_executable(
+    single_instance_manager_test ${CMAKE_SOURCE_DIR}/cockatrice/src/single_instance_manager.cpp
+                                 single_instance_manager_test.cpp
+  )
+  target_include_directories(single_instance_manager_test PRIVATE ${CMAKE_SOURCE_DIR}/cockatrice/src)
+
+  add_test(NAME single_instance_manager_test COMMAND single_instance_manager_test)
+endif()
+
 find_package(GTest)
 
 if(NOT GTEST_FOUND)
@@ -30,353 +122,91 @@ if(NOT GTEST_FOUND)
   target_include_directories(gtest INTERFACE "$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/gtest-src/include>")
 
   set(GTEST_INCLUDE_DIRS "${CMAKE_BINARY_DIR}/gtest-src/include")
-  # gtest_main is not optional here. FindGTest sets GTEST_BOTH_LIBRARIES to both halves, so this
-  # has to match it or the two paths disagree about what provides main(). A test source that
-  # defines its own main() gets away with the omission; one that does not fails at link with
-  # `undefined reference to main` pointing at crt1.o, which names neither gtest nor this line.
-  set(GTEST_BOTH_LIBRARIES gtest gtest_main)
+  set(GTEST_BOTH_LIBRARIES gtest)
+  add_dependencies(dummy_test gtest)
+  add_dependencies(expression_test gtest)
+  add_dependencies(clamped_arithmetic_test gtest)
+  add_dependencies(test_age_formatting gtest)
+  add_dependencies(password_hash_test gtest)
+  add_dependencies(playmat_resolver_test gtest)
+  add_dependencies(deck_hash_performance_test gtest)
+  add_dependencies(server_card_counter_test gtest)
+  add_dependencies(server_counter_test gtest)
+  add_dependencies(server_rate_limiter_test gtest)
+  add_dependencies(server_developer_role_test gtest)
+  add_dependencies(server_game_join_test gtest)
+  add_dependencies(warning_categories_test gtest)
+  if(TARGET translation_loader_test)
+    add_dependencies(translation_loader_test gtest)
+  endif()
+  add_dependencies(report_categories_test gtest)
+  add_dependencies(lag_monitor_test gtest)
+  add_dependencies(latency_tracker_test gtest)
+  add_dependencies(metrics_registry_test gtest)
+  add_dependencies(loader_local_matching_test gtest)
+  add_dependencies(single_instance_manager_test gtest)
 endif()
 
-# Directory-scoped on purpose: the test subdirectories below add targets that include the
-# fetched gtest headers and do not repeat this path themselves.
 include_directories(${GTEST_INCLUDE_DIRS})
-
-# --- Test registration ----------------------------------------------------------
-#
-# Every test target needs the same four steps: build the executable, depend on gtest when it
-# was fetched from source, link the shared test libraries, and hand the cases to CTest. The
-# `if(NOT GTEST_FOUND)` branch is the easy one to forget — omit it and the link fails with
-# undefined gtest symbols — so it lives here once instead of being repeated per test.
-#
-# This also replaces `add_test(NAME x COMMAND x)`. Naming the binary as a single CTest entry
-# hides which case failed and makes `ctest -R Suite.Case` impossible; discovery exposes each
-# TEST() as its own CTest entry instead.
-#
-# Labels: exactly one per test, because gtest_discover_tests() cannot carry more than one.
-# GoogleTestAddTests.cmake accumulates the generated script with `foreach(arg ${ARGN})`, so a
-# label list serialises as bare `LABELS ci server` in the CTestTestfile, and CTest reads only
-# the first value of a property and silently discards the rest. A label therefore classifies a
-# test into exactly one group, and the three groups cover every selection worth making:
-#
-#   ci      the default hermetic set, so `ctest -LE bench` runs everything but benchmarks
-#   server  servatrice-facing tests, so `ctest -L server` works
-#   bench   the slow suites, kept out of the default run
-#
-# A second label is a configure-time FATAL_ERROR rather than a line CTest quietly reads as one.
-# Anything orthogonal to a test's kind belongs in a helper flag beside the label, so it
-# composes with the group instead of competing for the single slot. NO_SANITIZE is such a flag.
-#
-# TIMEOUT is bounded per test because CTest's implicit default is 1500s: one hung socket wait
-# would otherwise stall CI for 25 minutes.
-#
-# EXTRA_LIBS is appended after the shared libraries so a caller adding a static archive (zlib,
-# lzma) keeps it last, which is where the linker needs it.
-
-function(cockatrice_add_test)
-  cmake_parse_arguments(
-    PARSE_ARGV 0 ARG "MANUAL;NO_SANITIZE" "NAME" "SOURCES;LIBS;LABELS;DEFINITIONS;INCLUDE_DIRS;EXTRA_LIBS"
-  )
-
-  if(NOT ARG_NAME OR NOT ARG_SOURCES)
-    message(FATAL_ERROR "cockatrice_add_test requires at least NAME and SOURCES")
-  endif()
-
-  add_executable(${ARG_NAME} ${ARG_SOURCES})
-
-  if(ARG_INCLUDE_DIRS)
-    target_include_directories(${ARG_NAME} PRIVATE ${ARG_INCLUDE_DIRS})
-  endif()
-
-  if(ARG_DEFINITIONS)
-    target_compile_definitions(${ARG_NAME} PRIVATE ${ARG_DEFINITIONS})
-  endif()
-
+target_link_libraries(dummy_test Threads::Threads ${GTEST_BOTH_LIBRARIES})
+target_link_libraries(expression_test libcockatrice_utility Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES})
+target_link_libraries(
+  clamped_arithmetic_test libcockatrice_utility Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES}
+)
+target_link_libraries(
+  test_age_formatting libcockatrice_utility Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES}
+)
+target_link_libraries(
+  password_hash_test libcockatrice_utility Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES}
+)
+target_link_libraries(
+  playmat_resolver_test libcockatrice_deck_list libcockatrice_utility Threads::Threads ${GTEST_BOTH_LIBRARIES}
+  ${TEST_QT_MODULES}
+)
+target_link_libraries(
+  deck_hash_performance_test libcockatrice_deck_list libcockatrice_utility Threads::Threads ${GTEST_BOTH_LIBRARIES}
+  ${TEST_QT_MODULES}
+)
+target_link_libraries(
+  server_card_counter_test libcockatrice_network Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES}
+)
+target_link_libraries(
+  server_counter_test libcockatrice_network Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES}
+)
+target_link_libraries(
+  server_rate_limiter_test libcockatrice_utility Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES}
+)
+target_link_libraries(
+  server_developer_role_test libcockatrice_network libcockatrice_rng Threads::Threads ${GTEST_BOTH_LIBRARIES}
+  ${TEST_QT_MODULES}
+)
+target_link_libraries(
+  server_game_join_test libcockatrice_network_server_remote libcockatrice_rng Threads::Threads ${GTEST_BOTH_LIBRARIES}
+  ${TEST_QT_MODULES}
+)
+target_link_libraries(
+  warning_categories_test libcockatrice_utility Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES}
+)
+if(TARGET translation_loader_test)
   target_link_libraries(
-    ${ARG_NAME} ${ARG_LIBS} Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES} ${ARG_EXTRA_LIBS}
-  )
-
-  # Only needed when gtest was downloaded and add_subdirectory'd above. An imported gtest
-  # target already carries its own dependency, so this must stay conditional.
-  if(NOT GTEST_FOUND)
-    add_dependencies(${ARG_NAME} gtest gtest_main)
-  endif()
-
-  # MANUAL targets are built but deliberately kept out of ctest: benchmarks that need a card
-  # database, hit the network, or measure RAM. Leaving them unregistered keeps CI hermetic
-  # and fast. They still link gtest so they can use TEST() without a second code path.
-  if(ARG_MANUAL)
-    return()
-  endif()
-
-  # NO_SANITIZE marks a target the sanitizer leg cannot run. Excluded by not handing its cases
-  # to CTest at all, rather than by a label, so the exclusion cannot rot into a line CTest
-  # quietly reads as something else. The target still builds, and still runs on the other legs.
-  if(ARG_NO_SANITIZE AND COCKATRICE_SANITIZERS)
-    return()
-  endif()
-
-  # One label only, per the note above. Rejecting a second loudly beats emitting a
-  # CTestTestfile line that CTest will quietly read as one label.
-  list(LENGTH ARG_LABELS _label_count)
-  if(_label_count GREATER 1)
-    message(FATAL_ERROR "${ARG_NAME}: pass at most one label, got '${ARG_LABELS}'")
-  endif()
-  if(NOT ARG_LABELS)
-    set(ARG_LABELS ci)
-  endif()
-
-  # GoogleTestAddTests defaults DISCOVERY_TIMEOUT to 5s, which is ample for a plain debug
-  # binary (--gtest_list_tests costs 0.04s) but not for an instrumented one (~2.8s cold, and
-  # discovery runs several binaries concurrently behind a -j build). Left at the default, a
-  # sanitizer build fails at the *link* step with a bare "Process terminated due to timeout"
-  # and no hint that discovery, not the test, is what is slow.
-  if(COCKATRICE_SANITIZERS)
-    set(_discovery_timeout 300)
-  else()
-    set(_discovery_timeout 60)
-  endif()
-
-  gtest_discover_tests(
-    ${ARG_NAME} DISCOVERY_MODE POST_BUILD DISCOVERY_TIMEOUT ${_discovery_timeout}
-    PROPERTIES LABELS "${ARG_LABELS}"
-    TIMEOUT 60
-  )
-endfunction()
-
-# Same wiring for targets that are built but deliberately kept out of ctest: benchmarks that
-# need a card database, hit the network, or measure RAM. A separate name rather than a MANUAL
-# flag spelled out at each call site, so "this is not in the CI suite" is visible in the CMake
-# file. Note the unquoted expansions: an unset multi-value keyword expands to zero arguments,
-# which is what lets this forward a caller's keywords verbatim without tripping the FATAL_ERROR
-# guard above on an empty list.
-function(cockatrice_add_manual_test)
-  cmake_parse_arguments(PARSE_ARGV 0 ARG "" "NAME" "SOURCES;LIBS;DEFINITIONS;INCLUDE_DIRS;EXTRA_LIBS")
-
-  cockatrice_add_test(
-    NAME
-    ${ARG_NAME}
-    SOURCES
-    ${ARG_SOURCES}
-    LIBS
-    ${ARG_LIBS}
-    DEFINITIONS
-    ${ARG_DEFINITIONS}
-    INCLUDE_DIRS
-    ${ARG_INCLUDE_DIRS}
-    EXTRA_LIBS
-    ${ARG_EXTRA_LIBS}
-    MANUAL
-  )
-endfunction()
-
-# --- Unit tests ------------------------------------------------------------------
-
-cockatrice_add_test(NAME expression_test SOURCES expression_test.cpp LIBS libcockatrice_utility)
-cockatrice_add_test(NAME clamped_arithmetic_test SOURCES clamped_arithmetic_test.cpp LIBS libcockatrice_utility)
-cockatrice_add_test(NAME test_age_formatting SOURCES test_age_formatting.cpp LIBS libcockatrice_utility)
-cockatrice_add_test(NAME password_hash_test SOURCES password_hash_test.cpp LIBS libcockatrice_utility)
-cockatrice_add_test(NAME report_categories_test SOURCES report_categories_test.cpp LIBS libcockatrice_utility)
-cockatrice_add_test(NAME warning_categories_test SOURCES warning_categories_test.cpp LIBS libcockatrice_utility)
-cockatrice_add_test(
-  NAME
-  playmat_resolver_test
-  SOURCES
-  playmat_resolver_test.cpp
-  LIBS
-  libcockatrice_deck_list
-  libcockatrice_utility
-)
-cockatrice_add_test(
-  NAME
-  server_rate_limiter_test
-  SOURCES
-  server_rate_limiter_test.cpp
-  LIBS
-  libcockatrice_utility
-  LABELS
-  server
-)
-cockatrice_add_test(
-  NAME
-  server_card_counter_test
-  SOURCES
-  server_card_counter_test.cpp
-  LIBS
-  libcockatrice_network
-  LABELS
-  server
-)
-cockatrice_add_test(
-  NAME
-  server_dump_zone_test
-  SOURCES
-  server_dump_zone_test.cpp
-  LIBS
-  libcockatrice_rng
-  libcockatrice_network
-  LABELS
-  server
-)
-cockatrice_add_test(
-  NAME
-  server_counter_test
-  SOURCES
-  server_counter_test.cpp
-  LIBS
-  libcockatrice_network
-  LABELS
-  server
-)
-cockatrice_add_test(
-  NAME
-  server_developer_role_test
-  NO_SANITIZE
-  SOURCES
-  server_developer_role_test.cpp
-  LIBS
-  libcockatrice_network
-  libcockatrice_rng
-  LABELS
-  server
-)
-cockatrice_add_test(
-  NAME
-  server_moderator_role_test
-  NO_SANITIZE
-  SOURCES
-  server_moderator_role_test.cpp
-  LIBS
-  libcockatrice_network
-  libcockatrice_rng
-  LABELS
-  server
-)
-cockatrice_add_test(
-  NAME
-  server_game_join_test
-  SOURCES
-  server_game_join_test.cpp
-  LIBS
-  libcockatrice_network_server_remote
-  libcockatrice_rng
-  LABELS
-  server
-)
-cockatrice_add_test(
-  NAME
-  latency_tracker_test
-  SOURCES
-  latency_tracker_test.cpp
-  LIBS
-  libcockatrice_network
-  LABELS
-  server
-)
-cockatrice_add_test(
-  NAME
-  lag_monitor_test
-  SOURCES
-  ${CMAKE_SOURCE_DIR}/cockatrice/src/client/lag_monitor.cpp
-  lag_monitor_test.cpp
-  INCLUDE_DIRS
-  ${CMAKE_SOURCE_DIR}/cockatrice/src
-)
-cockatrice_add_test(
-  NAME
-  metrics_registry_test
-  SOURCES
-  ${CMAKE_SOURCE_DIR}/servatrice/src/metrics_registry.cpp
-  metrics_registry_test.cpp
-  INCLUDE_DIRS
-  ${CMAKE_SOURCE_DIR}/servatrice/src
-  LABELS
-  server
-)
-cockatrice_add_test(
-  NAME
-  card_update_progress_test
-  SOURCES
-  ${CMAKE_SOURCE_DIR}/cockatrice/src/interface/card_database_update/card_update_progress.cpp
-  card_update_progress_test.cpp
-  INCLUDE_DIRS
-  ${CMAKE_SOURCE_DIR}/cockatrice/src
-)
-cockatrice_add_test(
-  NAME
-  loader_local_matching_test
-  SOURCES
-  ${CMAKE_SOURCE_DIR}/cockatrice/src/interface/card_picture_loader/card_picture_loader_local.cpp
-  ${CMAKE_SOURCE_DIR}/cockatrice/src/client/settings/cache_settings.cpp
-  ${CMAKE_SOURCE_DIR}/cockatrice/src/client/settings/card_counter_settings.cpp
-  ${CMAKE_SOURCE_DIR}/cockatrice/src/client/settings/shortcuts_settings.cpp
-  ${CMAKE_SOURCE_DIR}/cockatrice/src/client/network/update/client/release_channel.cpp
-  ${VERSION_STRING_CPP}
-  loader_local_matching_test.cpp
-  LIBS
-  libcockatrice_settings
-  INCLUDE_DIRS
-  ${CMAKE_SOURCE_DIR}/cockatrice/src
-)
-cockatrice_add_test(
-  NAME
-  deck_hash_performance_test
-  SOURCES
-  deck_hash_performance_test.cpp
-  LIBS
-  libcockatrice_deck_list
-  libcockatrice_utility
-  LABELS
-  bench
-)
-
-# The translation loader test compiles a .qm fixture, which needs lrelease from Qt Linguist.
-if(TARGET Qt6::lrelease)
-  set(TRANSLATION_LOADER_TEST_QM "${CMAKE_CURRENT_BINARY_DIR}/translation_loader_test_de.qm")
-  add_custom_command(
-    OUTPUT "${TRANSLATION_LOADER_TEST_QM}"
-    COMMAND Qt6::lrelease "${CMAKE_CURRENT_SOURCE_DIR}/translation_loader_test.ts" -qm "${TRANSLATION_LOADER_TEST_QM}"
-    DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/translation_loader_test.ts"
-    COMMENT "Compiling translation_loader_test.ts"
-  )
-  add_custom_target(translation_loader_test_qm DEPENDS "${TRANSLATION_LOADER_TEST_QM}")
-
-  cockatrice_add_test(
-    NAME
-    translation_loader_test
-    SOURCES
-    translation_loader_test.cpp
-    LIBS
-    libcockatrice_utility
-    DEFINITIONS
-    TRANSLATION_LOADER_TEST_DIR="${CMAKE_CURRENT_BINARY_DIR}"
-  )
-  add_dependencies(translation_loader_test translation_loader_test_qm)
-
-  # A multi-config generator (MSBuild, Xcode) puts the executable in a per-config subdirectory while
-  # the .qm stays in the current binary directory, so copy the fixture next to the binary: that is the
-  # layout ABuildTreeFindsTheTranslationsNextToTheExecutable is about, and the only one it finds on
-  # those generators.
-  add_custom_command(
-    TARGET translation_loader_test
-    POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E copy_if_different "${TRANSLATION_LOADER_TEST_QM}"
-            "$<TARGET_FILE_DIR:translation_loader_test>/"
-    VERBATIM
+    translation_loader_test libcockatrice_utility Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES}
   )
 endif()
+target_link_libraries(
+  report_categories_test libcockatrice_utility Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES}
+)
+target_link_libraries(lag_monitor_test Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES})
+target_link_libraries(
+  latency_tracker_test libcockatrice_network Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES}
+)
+target_include_directories(metrics_registry_test PRIVATE ${CMAKE_SOURCE_DIR}/servatrice/src)
+target_link_libraries(metrics_registry_test ${TEST_QT_MODULES} Threads::Threads ${GTEST_BOTH_LIBRARIES})
+target_link_libraries(
+  loader_local_matching_test libcockatrice_settings Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES}
+)
 
-# Guard must match the condition for src/single_instance_manager.cpp in cockatrice/CMakeLists.txt.
 if(WITH_CLIENT)
-  cockatrice_add_test(
-    NAME
-    single_instance_manager_test
-    SOURCES
-    ${CMAKE_SOURCE_DIR}/cockatrice/src/single_instance_manager.cpp
-    single_instance_manager_test.cpp
-    INCLUDE_DIRS
-    ${CMAKE_SOURCE_DIR}/cockatrice/src
-    ${CMAKE_SOURCE_DIR}/libcockatrice_utility
-  )
+  target_link_libraries(single_instance_manager_test Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES})
 endif()
 
 add_subdirectory(card_zone_algorithms)
diff --git a/tests/card_update_progress_test.cpp b/tests/card_update_progress_test.cpp
deleted file mode 100644
index 849cf623c..000000000
--- a/tests/card_update_progress_test.cpp
+++ /dev/null
@@ -1,93 +0,0 @@
-#include "interface/card_database_update/card_update_progress.h"
-
-#include <QByteArray>
-#include <QString>
-#include <gtest/gtest.h>
-
-namespace
-{
-std::optional<CardUpdateProgress> parseLine(const QByteArray &line)
-{
-    return CardUpdateProgress::fromProtocolLine(line);
-}
-} // namespace
-
-TEST(CardUpdateProgressTest, ParsesAValidDownloadLine)
-{
-    const std::optional<CardUpdateProgress> progress = parseLine("PROGRESS download 42 100");
-    ASSERT_TRUE(progress.has_value());
-    EXPECT_EQ(CardUpdateStage::Download, progress->stage);
-    EXPECT_EQ(42, progress->done);
-    EXPECT_EQ(100, progress->total);
-}
-
-TEST(CardUpdateProgressTest, ParsesTrailingNewline)
-{
-    const std::optional<CardUpdateProgress> progress = parseLine("PROGRESS scan 7 99\n");
-    ASSERT_TRUE(progress.has_value());
-    EXPECT_EQ(CardUpdateStage::Scan, progress->stage);
-    EXPECT_EQ(7, progress->done);
-    EXPECT_EQ(99, progress->total);
-}
-
-TEST(CardUpdateProgressTest, ParsesWithSurroundingWhitespace)
-{
-    const std::optional<CardUpdateProgress> progress = parseLine(QByteArray("  PROGRESS import 3 10  "));
-    ASSERT_TRUE(progress.has_value());
-    EXPECT_EQ(CardUpdateStage::Import, progress->stage);
-    EXPECT_EQ(3, progress->done);
-    EXPECT_EQ(10, progress->total);
-}
-
-TEST(CardUpdateProgressTest, AcceptsZeroProgress)
-{
-    const std::optional<CardUpdateProgress> progress = parseLine("PROGRESS download 0 0");
-    ASSERT_TRUE(progress.has_value());
-    EXPECT_EQ(0, progress->done);
-    EXPECT_EQ(0, progress->total);
-}
-
-TEST(CardUpdateProgressTest, RejectsLinesWithoutProgressPrefix)
-{
-    EXPECT_FALSE(parseLine("download 42 100").has_value());
-    EXPECT_FALSE(parseLine("PROGRESSdownload 42 100").has_value());
-    EXPECT_FALSE(parseLine("").has_value());
-}
-
-TEST(CardUpdateProgressTest, RejectsMalformedLines)
-{
-    EXPECT_FALSE(parseLine("PROGRESS").has_value());
-    EXPECT_FALSE(parseLine("PROGRESS download").has_value());
-    EXPECT_FALSE(parseLine("PROGRESS download 42 100 extra").has_value());
-    EXPECT_FALSE(parseLine("PROGRESS download 42").has_value());
-    EXPECT_FALSE(parseLine("PROGRESS download notANumber 100").has_value());
-}
-
-TEST(CardUpdateProgressTest, RejectsNegativeValues)
-{
-    EXPECT_FALSE(parseLine("PROGRESS download -1 100").has_value());
-    EXPECT_FALSE(parseLine("PROGRESS download 42 -100").has_value());
-}
-
-TEST(CardUpdateProgressTest, AcceptsUnknownStagesSchemalessly)
-{
-    const std::optional<CardUpdateProgress> progress = parseLine("PROGRESS spoilers 1 2");
-    ASSERT_TRUE(progress.has_value());
-    EXPECT_EQ(CardUpdateStage::Unknown, progress->stage);
-    EXPECT_EQ(1, progress->done);
-    EXPECT_EQ(2, progress->total);
-}
-
-TEST(CardUpdateProgressTest, StageTokensRoundTrip)
-{
-    EXPECT_EQ("download", CardUpdateProgress{CardUpdateStage::Download}.stageToken());
-    EXPECT_EQ("scan", CardUpdateProgress{CardUpdateStage::Scan}.stageToken());
-    EXPECT_EQ("import", CardUpdateProgress{CardUpdateStage::Import}.stageToken());
-    EXPECT_EQ("unknown", CardUpdateProgress{CardUpdateStage::Unknown}.stageToken());
-}
-
-int main(int argc, char **argv)
-{
-    ::testing::InitGoogleTest(&argc, argv);
-    return RUN_ALL_TESTS();
-}
\ No newline at end of file
diff --git a/tests/card_zone_algorithms/CMakeLists.txt b/tests/card_zone_algorithms/CMakeLists.txt
index 945f8a0ed..e03d8f77d 100644
--- a/tests/card_zone_algorithms/CMakeLists.txt
+++ b/tests/card_zone_algorithms/CMakeLists.txt
@@ -1,4 +1,15 @@
-cockatrice_add_test(
-  NAME card_zone_algorithms_test SOURCES card_zone_algorithms_test.cpp INCLUDE_DIRS
-  ${CMAKE_SOURCE_DIR}/cockatrice/src/game/zones
+add_executable(card_zone_algorithms_test card_zone_algorithms_test.cpp)
+
+target_include_directories(card_zone_algorithms_test PRIVATE ${CMAKE_SOURCE_DIR}/cockatrice/src/game/zones)
+
+target_link_libraries(
+  card_zone_algorithms_test
+  PRIVATE Threads::Threads
+  PRIVATE ${GTEST_BOTH_LIBRARIES}
 )
+
+add_test(NAME card_zone_algorithms_test COMMAND card_zone_algorithms_test)
+
+if(NOT GTEST_FOUND)
+  add_dependencies(card_zone_algorithms_test gtest)
+endif()
diff --git a/tests/card_zone_algorithms/card_zone_algorithms_test.cpp b/tests/card_zone_algorithms/card_zone_algorithms_test.cpp
index 4f5282235..8fab42566 100644
--- a/tests/card_zone_algorithms/card_zone_algorithms_test.cpp
+++ b/tests/card_zone_algorithms/card_zone_algorithms_test.cpp
@@ -1,7 +1,6 @@
 #include "card_zone_algorithms.h"
 
 #include <gtest/gtest.h>
-#include <string>
 #include <vector>
 
 struct MockCardRef
diff --git a/tests/carddatabase/CMakeLists.txt b/tests/carddatabase/CMakeLists.txt
index 22171a9e8..811cebc1d 100644
--- a/tests/carddatabase/CMakeLists.txt
+++ b/tests/carddatabase/CMakeLists.txt
@@ -9,46 +9,61 @@ add_definitions("-DCARDDB_DATADIR=\"${CMAKE_CURRENT_SOURCE_DIR}/data/\"")
 # ------------------------
 # Card Database Test
 # ------------------------
-cockatrice_add_test(
-  NAME
+add_executable(carddatabase_test ${MOCKS_SOURCES} ${VERSION_STRING_CPP} carddatabase_test.cpp mocks.cpp)
+
+target_link_libraries(
   carddatabase_test
-  SOURCES
-  ${VERSION_STRING_CPP}
-  carddatabase_test.cpp
-  mocks.cpp
-  LIBS
-  libcockatrice_card
+  PRIVATE libcockatrice_card
+  PRIVATE Threads::Threads
+  PRIVATE ${GTEST_BOTH_LIBRARIES}
+  PRIVATE ${TEST_QT_MODULES}
 )
 
+add_test(NAME carddatabase_test COMMAND carddatabase_test)
+
+# ------------------------
+# Load Benchmark (manual, not run in CI)
+# ------------------------
+add_executable(load_benchmark ${MOCKS_SOURCES} ${VERSION_STRING_CPP} load_benchmark.cpp mocks.cpp)
+
+target_link_libraries(
+  load_benchmark
+  PRIVATE libcockatrice_card
+  PRIVATE libcockatrice_models
+  PRIVATE Threads::Threads
+  PRIVATE ${GTEST_BOTH_LIBRARIES}
+  PRIVATE ${TEST_QT_MODULES}
+)
+
+if(NOT GTEST_FOUND)
+  add_dependencies(load_benchmark gtest)
+endif()
+
 # ------------------------
 # Filter String Test
 # (guard must match the condition for libcockatrice_filters in the root CMakeLists.txt)
 # ------------------------
 if(WITH_ORACLE OR WITH_CLIENT)
-  cockatrice_add_test(
-    NAME
+  add_executable(filter_string_test ${MOCKS_SOURCES} ${VERSION_STRING_CPP} filter_string_test.cpp mocks.cpp)
+
+  target_link_libraries(
     filter_string_test
-    SOURCES
-    ${VERSION_STRING_CPP}
-    filter_string_test.cpp
-    mocks.cpp
-    LIBS
-    libcockatrice_filters
+    PRIVATE libcockatrice_filters
+    PRIVATE Threads::Threads
+    PRIVATE ${GTEST_BOTH_LIBRARIES}
+    PRIVATE ${TEST_QT_MODULES}
   )
+
+  add_test(NAME filter_string_test COMMAND filter_string_test)
+
+  if(NOT GTEST_FOUND)
+    add_dependencies(filter_string_test gtest)
+  endif()
 endif()
 
 # ------------------------
-# Load Benchmark (manual, not run in CI)
+# Dependencies on gtest
 # ------------------------
-cockatrice_add_manual_test(
-  NAME
-  load_benchmark
-  SOURCES
-  ${VERSION_STRING_CPP}
-  load_benchmark.cpp
-  mocks.cpp
-  LIBS
-  libcockatrice_card
-  libcockatrice_models
-  MANUAL
-)
+if(NOT GTEST_FOUND)
+  add_dependencies(carddatabase_test gtest)
+endif()
diff --git a/tests/carddatabase/carddatabase_test.cpp b/tests/carddatabase/carddatabase_test.cpp
index 1b48d934b..392f6395a 100644
--- a/tests/carddatabase/carddatabase_test.cpp
+++ b/tests/carddatabase/carddatabase_test.cpp
@@ -1,36 +1,15 @@
-#include "libcockatrice/card/database/card_database.h"
-#include "libcockatrice/card/database/card_database_loader.h"
-#include "libcockatrice/card/database/card_database_querier.h"
-#include "libcockatrice/card/set/card_set.h"
-#include "libcockatrice/card/set/card_set_list.h"
+#include "mocks.h"
 #include "test_card_database_path_provider.h"
 
 #include "gtest/gtest.h"
-#include <QDate>
-#include <QDateTime>
-#include <QDir>
-#include <QFile>
-#include <QFileDevice>
-#include <QFileInfo>
-#include <QHash>
-#include <QIODevice>
-#include <QList>
-#include <QSharedPointer>
-#include <QString>
-#include <QStringList>
 #include <QTemporaryDir>
-#include <QVector>
 #include <libcockatrice/card/card_info.h>
 #include <libcockatrice/card/database/card_database_data.h>
 #include <libcockatrice/card/database/parser/cockatrice_xml_4.h>
 #include <libcockatrice/card/lazy_properties_hash.h>
 #include <libcockatrice/card/printing/printing_info.h>
-#include <libcockatrice/interfaces/interface_card_database_path_provider.h>
-#include <libcockatrice/interfaces/interface_card_set_priority_controller.h>
 #include <libcockatrice/interfaces/noop_card_preference_provider.h>
 #include <libcockatrice/interfaces/noop_card_set_priority_controller.h>
-#include <string>
-
 namespace
 {
 
@@ -85,11 +64,12 @@ TEST(CardDatabaseTest, Xml4LocalizedDataRoundTrip)
 
     QTemporaryDir tempDir;
     const QString fileName = tempDir.filePath("cards.xml");
-    CockatriceXml4Parser writer(&controller);
+    NoopCardPreferenceProvider prefProvider;
+    CockatriceXml4Parser writer(&prefProvider, &controller);
     ASSERT_TRUE(writer.saveToFile({}, sets, cards, fileName));
 
     CardDatabaseData data;
-    CockatriceXml4Parser parser(&controller);
+    CockatriceXml4Parser parser(&prefProvider, &controller);
     QFile file(fileName);
     ASSERT_TRUE(file.open(QIODevice::ReadOnly));
     parser.parseFileInto(file, data);
@@ -101,413 +81,6 @@ TEST(CardDatabaseTest, Xml4LocalizedDataRoundTrip)
     ASSERT_EQ(loaded->getLocalizedText("de"), "Blitzschlag fügt 3 Schadenspunkte zu.");
     ASSERT_EQ(loaded->getLocalizedText("fr"), "Deal 3 damage.");
 }
-
-/**
- * @brief Path provider serving a sandboxed copy of the test card database.
- */
-class SandboxPathProvider : public ICardDatabasePathProvider
-{
-public:
-    explicit SandboxPathProvider(const QString &_root) : root(_root)
-    {
-    }
-
-    QString getCardDatabasePath() const override
-    {
-        return root + "/cards.xml";
-    }
-
-    QString getCustomCardDatabasePath() const override
-    {
-        return root + "/customsets/";
-    }
-
-    QString getTokenDatabasePath() const override
-    {
-        return root + "/tokens.xml";
-    }
-
-    QString getSpoilerCardDatabasePath() const override
-    {
-        return root + "/spoiler.xml";
-    }
-
-private:
-    QString root;
-};
-
-/**
- * @brief Set priority controller whose enablement state the test drives directly.
- *
- * Seeded short names behave like entries present in cardDatabase.ini (enabled,
- * known). Anything the parser discovers but the test did not seed falls back to
- * the default SetOptions, i.e. disabled and unknown, mirroring
- * CardDatabaseSettings for sets without an ini group.
- */
-class SeededSetPriorityController : public ICardSetPriorityController
-{
-public:
-    void seed(const QStringList &shortNames)
-    {
-        for (const QString &shortName : shortNames) {
-            SetOptions options;
-            options.enabled = true;
-            options.isKnown = true;
-            setOptions.insert(shortName, options);
-        }
-    }
-
-    void setSortKey(QString shortName, unsigned int sortKey) override
-    {
-        ++individualWrites;
-        setOptions[shortName].sortKey = sortKey;
-    }
-
-    void setEnabled(QString shortName, bool enabled) override
-    {
-        ++individualWrites;
-        setOptions[shortName].enabled = enabled;
-    }
-
-    void setIsKnown(QString shortName, bool isknown) override
-    {
-        ++individualWrites;
-        setOptions[shortName].isKnown = isknown;
-    }
-
-    unsigned int getSortKey(QString shortName) const override
-    {
-        return setOptions.value(shortName).sortKey;
-    }
-
-    bool isEnabled(QString shortName) const override
-    {
-        return setOptions.value(shortName).enabled;
-    }
-
-    bool isKnown(QString shortName) const override
-    {
-        return setOptions.value(shortName).isKnown;
-    }
-
-    SetOptions getSetOptions(QString shortName) const override
-    {
-        return setOptions.value(shortName);
-    }
-
-    QStringList getEnabledSetNames() const override
-    {
-        QStringList names;
-        for (auto it = setOptions.constBegin(); it != setOptions.constEnd(); ++it) {
-            if (it.value().enabled) {
-                names << it.key();
-            }
-        }
-        names.sort();
-        return names;
-    }
-
-    void saveSets(const QVector<SetSaveData> &data) override
-    {
-        ++batchedWrites;
-        for (const SetSaveData &entry : data) {
-            setOptions[entry.shortName].sortKey = entry.sortKey;
-            setOptions[entry.shortName].enabled = entry.enabled;
-            setOptions[entry.shortName].isKnown = entry.isKnown;
-        }
-    }
-
-    int individualWrites = 0; ///< Per-set/per-option controller writes (the slow path).
-    int batchedWrites = 0;    ///< Batched saveSets() flushes (the fast path).
-
-private:
-    QHash<QString, SetOptions> setOptions;
-};
-
-/**
- * @brief Sandboxed card database plus enablement controller for cache tests.
- *
- * Copies the checked-in fixture XML into a temporary directory so each test
- * owns the files (and the binary cache written next to them).
- */
-class CardDatabaseCacheInvalidationTest : public ::testing::Test
-{
-protected:
-    void SetUp() override
-    {
-        ASSERT_TRUE(tempDir.isValid());
-        root = tempDir.path();
-        ASSERT_TRUE(QFile::copy(QString(CARDDB_DATADIR) + "cards.xml", root + "/cards.xml"));
-        ASSERT_TRUE(QFile::copy(QString(CARDDB_DATADIR) + "tokens.xml", root + "/tokens.xml"));
-        ASSERT_TRUE(QDir(root).mkpath("customsets"));
-        ASSERT_TRUE(
-            QFile::copy(QString(CARDDB_DATADIR) + "customsets/customset1.xml", root + "/customsets/customset1.xml"));
-        controller.seed({"CAT", "DOG", "WHO", " Not a Card", "BRD"});
-    }
-
-    /**
-     * @brief Contents of the binary cache written next to cards.xml.
-     * @return The cache file bytes, or an empty array if no cache exists.
-     */
-    QByteArray cacheContents() const
-    {
-        QFile file(root + "/cards.xml.cache");
-        if (!file.open(QIODevice::ReadOnly)) {
-            return {};
-        }
-        return file.readAll();
-    }
-
-    QTemporaryDir tempDir;
-    QString root;
-    SeededSetPriorityController controller;
-};
-
-TEST_F(CardDatabaseCacheInvalidationTest, DisablingSetBustsCacheAndDropsPrintings)
-{
-    NoopCardPreferenceProvider prefs;
-    SandboxPathProvider pathProvider(root);
-    CardDatabase db(nullptr, &prefs, &pathProvider, &controller);
-
-    db.loadCardDatabases();
-    const QByteArray initialCache = cacheContents();
-    ASSERT_FALSE(initialCache.isEmpty()) << "first load must write the binary cache";
-    ASSERT_FALSE(db.getCardList().value("Cat").isNull());
-    ASSERT_TRUE(db.getCardList().value("Cat")->getSets().contains("CAT"));
-
-    // A cache-aware load with unchanged inputs keeps the cache: the parse
-    // result would be identical, so there is nothing to invalidate.
-    db.loadCardDatabases();
-    EXPECT_EQ(initialCache, cacheContents()) << "load with unchanged inputs must keep the cache";
-
-    // Disabling a set changes the source hash, so the next load re-parses and
-    // the set's printings disappear everywhere.
-    controller.setEnabled("CAT", false);
-    db.reloadCardDatabasesAndNotify();
-    EXPECT_NE(initialCache, cacheContents()) << "toggling set enablement must bust the cache";
-    ASSERT_FALSE(db.getCardList().value("Cat").isNull());
-    EXPECT_FALSE(db.getCardList().value("Cat")->getSets().contains("CAT")) << "disabled set printings must be dropped";
-    ASSERT_FALSE(db.getCardList().value("Kitten").isNull());
-    EXPECT_FALSE(db.getCardList().value("Kitten")->getSets().contains("CAT"));
-}
-
-TEST_F(CardDatabaseCacheInvalidationTest, AddingAndEnablingCustomSetBustsCache)
-{
-    NoopCardPreferenceProvider prefs;
-    SandboxPathProvider pathProvider(root);
-    CardDatabase db(nullptr, &prefs, &pathProvider, &controller);
-
-    db.loadCardDatabases();
-    const QByteArray initialCache = cacheContents();
-    ASSERT_FALSE(initialCache.isEmpty()) << "first load must write the binary cache";
-
-    // Drop a new custom set in: the input file list changes, so the next load
-    // must re-parse. BRD2 is unknown, so its set starts disabled.
-    QFile customSetFile(root + "/customsets/customset2.xml");
-    ASSERT_TRUE(customSetFile.open(QIODevice::WriteOnly | QIODevice::Truncate));
-    customSetFile.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-                        "<cockatrice_carddatabase version=\"4\">\n"
-                        "    <cards>\n"
-                        "        <card>\n"
-                        "            <name>Finch</name>\n"
-                        "            <set>BRD2</set>\n"
-                        "            <tablerow>0</tablerow>\n"
-                        "            <text>Chirp!</text>\n"
-                        "        </card>\n"
-                        "    </cards>\n"
-                        "</cockatrice_carddatabase>\n");
-    customSetFile.close();
-
-    db.reloadCardDatabasesAndNotify();
-    const QByteArray afterCustomSetAdded = cacheContents();
-    EXPECT_NE(initialCache, afterCustomSetAdded) << "adding a custom card database must bust the cache";
-    ASSERT_FALSE(db.getCardList().value("Finch").isNull()) << "the custom card must be loaded";
-    EXPECT_TRUE(db.getCardList().value("Finch")->getSets().isEmpty())
-        << "BRD2 starts disabled, so Finch has no printings yet";
-
-    // Enabling the freshly discovered set busts the cache again, so the next
-    // load finally parses its printings (#7455).
-    controller.setEnabled("BRD2", true);
-    db.reloadCardDatabasesAndNotify();
-    EXPECT_NE(afterCustomSetAdded, cacheContents()) << "enabling a set must bust the cache";
-    ASSERT_FALSE(db.getCardList().value("Finch").isNull());
-    EXPECT_TRUE(db.getCardList().value("Finch")->getSets().contains("BRD2"));
-}
-
-TEST_F(CardDatabaseCacheInvalidationTest, ExplicitReloadBypassesCache)
-{
-    NoopCardPreferenceProvider prefs;
-    SandboxPathProvider pathProvider(root);
-    CardDatabase db(nullptr, &prefs, &pathProvider, &controller);
-
-    db.loadCardDatabases();
-    ASSERT_FALSE(db.getCardList().value("Cat").isNull());
-    ASSERT_TRUE(db.getCardList().value("Cat")->getSets().contains("CAT"));
-
-    // Move Cat to the DOG set in place, keeping the file size identical and
-    // restoring the modification time afterwards: the source hash (path, size,
-    // mtime) still matches, so the cache stays valid by construction and only
-    // an explicit reload can pick the edit up.
-    const QString cardsPath = root + "/cards.xml";
-    QFile file(cardsPath);
-    ASSERT_TRUE(file.open(QIODevice::ReadOnly));
-    const qint64 stampedSecs = QFileInfo(cardsPath).lastModified().toSecsSinceEpoch();
-    QByteArray contents = file.readAll();
-    file.close();
-    const QByteArray oldSetCode("<set>CAT</set>");
-    const QByteArray newSetCode("<set>DOG</set>");
-    ASSERT_EQ(contents.count(oldSetCode), 1) << "fixture must contain exactly one CAT printing";
-    contents.replace(contents.indexOf(oldSetCode), oldSetCode.size(), newSetCode);
-    ASSERT_TRUE(file.open(QIODevice::ReadWrite));
-    ASSERT_EQ(file.write(contents), contents.size());
-    // Flush the pending write before stamping the time: close() would otherwise
-    // flush it afterwards and bump the modification time again, invalidating the
-    // cache on platforms that buffer writes (e.g. macOS).
-    ASSERT_TRUE(file.flush());
-    ASSERT_TRUE(file.setFileTime(QDateTime::fromSecsSinceEpoch(stampedSecs), QFileDevice::FileModificationTime));
-    file.close();
-    ASSERT_EQ(QFileInfo(cardsPath).lastModified().toSecsSinceEpoch(), stampedSecs)
-        << "the sandbox file's modification time must be restored for the cache to stay valid";
-
-    // The cache is still valid for a regular load, which serves the stale data.
-    db.loadCardDatabases();
-    ASSERT_FALSE(db.getCardList().value("Cat").isNull());
-    EXPECT_TRUE(db.getCardList().value("Cat")->getSets().contains("CAT")) << "regular load must hit the cache";
-    EXPECT_FALSE(db.getCardList().value("Cat")->getSets().contains("DOG"));
-
-    // The explicit reload ignores the cache and re-reads the file.
-    const QByteArray staleCache = cacheContents();
-    db.reloadCardDatabasesAndNotify();
-    EXPECT_NE(staleCache, cacheContents()) << "explicit reload must rewrite the cache from disk";
-    ASSERT_FALSE(db.getCardList().value("Cat").isNull());
-    EXPECT_FALSE(db.getCardList().value("Cat")->getSets().contains("CAT"));
-    EXPECT_TRUE(db.getCardList().value("Cat")->getSets().contains("DOG"));
-}
-
-TEST_F(CardDatabaseCacheInvalidationTest, FirstRunWithNoSetsEnabledSkipsCacheWrite)
-{
-    // A blank config: the parser discovers every set, but none of them has an
-    // ini entry, so all of them default to disabled (first run).
-    SeededSetPriorityController blankController;
-    NoopCardPreferenceProvider prefs;
-    SandboxPathProvider pathProvider(root);
-    CardDatabase db(nullptr, &prefs, &pathProvider, &blankController);
-
-    db.loadCardDatabases();
-    ASSERT_FALSE(db.getCardList().value("Cat").isNull()) << "cards are parsed even while their sets are disabled";
-    EXPECT_TRUE(db.getCardList().value("Cat")->getSets().isEmpty())
-        << "no printings survive an all-sets-disabled parse";
-    EXPECT_TRUE(cacheContents().isEmpty()) << "a stripped first-run snapshot must not be cached";
-}
-
-TEST_F(CardDatabaseCacheInvalidationTest, EnablingAllSetsAfterFirstRunRestoresPrintings)
-{
-    SeededSetPriorityController blankController;
-    NoopCardPreferenceProvider prefs;
-    SandboxPathProvider pathProvider(root);
-    CardDatabase db(nullptr, &prefs, &pathProvider, &blankController);
-
-    db.loadCardDatabases();
-    ASSERT_TRUE(cacheContents().isEmpty());
-
-    // This mirrors what checkUnknownSets() does on a first run: enable every
-    // set, then reload so the parser keeps the printings and the complete
-    // snapshot gets cached under the enabled-set hash.
-    for (const CardSetPtr &set : db.getSetList()) {
-        blankController.setEnabled(set->getShortName(), true);
-    }
-    db.reloadCardDatabasesAndNotify();
-
-    ASSERT_FALSE(db.getCardList().value("Cat").isNull());
-    EXPECT_TRUE(db.getCardList().value("Cat")->getSets().contains("CAT"));
-    EXPECT_FALSE(cacheContents().isEmpty()) << "the enabled-set snapshot must be cached";
-}
-
-TEST_F(CardDatabaseCacheInvalidationTest, CheckUnknownSetsBatchesFirstRunEnableAll)
-{
-    // Same first-run starting point as above, but driven through the real
-    // checkUnknownSets() path, which must persist the enable-all with a single
-    // batched saveSets() instead of per-set/per-option controller writes.
-    SeededSetPriorityController blankController;
-    NoopCardPreferenceProvider prefs;
-    SandboxPathProvider pathProvider(root);
-    CardDatabase db(nullptr, &prefs, &pathProvider, &blankController);
-
-    db.loadCardDatabases();
-    ASSERT_TRUE(db.getSetList().getEnabledSetsNum() == 0);
-
-    db.checkUnknownSets();
-
-    EXPECT_EQ(blankController.individualWrites, 0) << "first-run enable-all must not write per set";
-    EXPECT_EQ(blankController.batchedWrites, 1) << "first-run enable-all must persist with a single flush";
-    for (const CardSetPtr &set : db.getSetList()) {
-        EXPECT_TRUE(set->getEnabled()) << set->getShortName().toStdString();
-        EXPECT_TRUE(blankController.isEnabled(set->getShortName())) << set->getShortName().toStdString();
-        if (!set->getIsKnownIgnored()) {
-            EXPECT_TRUE(set->getIsKnown()) << set->getShortName().toStdString();
-            EXPECT_TRUE(blankController.isKnown(set->getShortName())) << set->getShortName().toStdString();
-        }
-    }
-
-    // The follow-up reload re-parses with the sets enabled, restoring printings.
-    db.reloadCardDatabasesAndNotify();
-    ASSERT_FALSE(db.getCardList().value("Cat").isNull());
-    EXPECT_TRUE(db.getCardList().value("Cat")->getSets().contains("CAT"));
-}
-
-TEST_F(CardDatabaseCacheInvalidationTest, EnableAllUnknownSetsIsBatched)
-{
-    // The "new sets found" dialog path: enabling the unknown delta must persist
-    // with a single flush no matter how many sets the database holds, so users
-    // with hundreds of custom sets don't stall the GUI thread. Built directly
-    // on CardSet objects because the fixture sets carry no metadata (and would
-    // all count as ignored).
-    SeededSetPriorityController controller;
-    CardSetList sets;
-    sets.append(
-        CardSet::newInstance(&controller, "AAA", "Alpha Set", "core", QDate(2020, 1, 1), CardSet::PriorityPrimary));
-    sets.append(
-        CardSet::newInstance(&controller, "BBB", "Beta Set", "expansion", QDate(2021, 6, 1), CardSet::PriorityPrimary));
-    sets.append(CardSet::newInstance(&controller, "XXX")); // no metadata: ignored
-
-    sets.enableAllUnknownBatched(&controller);
-
-    EXPECT_EQ(controller.individualWrites, 0) << "unknown-set enable must not write per set";
-    EXPECT_EQ(controller.batchedWrites, 1) << "unknown-set enable must persist with a single flush";
-    for (const CardSetPtr &set : sets) {
-        EXPECT_TRUE(set->getEnabled()) << set->getShortName().toStdString();
-        EXPECT_TRUE(controller.isEnabled(set->getShortName())) << set->getShortName().toStdString();
-        if (set->getIsKnownIgnored()) {
-            EXPECT_FALSE(set->getIsKnown()) << set->getShortName().toStdString();
-        } else {
-            EXPECT_TRUE(set->getIsKnown()) << set->getShortName().toStdString();
-            EXPECT_TRUE(controller.isKnown(set->getShortName())) << set->getShortName().toStdString();
-        }
-    }
-}
-
-TEST_F(CardDatabaseCacheInvalidationTest, MarkAllSetsAsKnownIsBatched)
-{
-    // The dialog's "No" path: same single-flush requirement as enabling.
-    SeededSetPriorityController controller;
-    CardSetList sets;
-    sets.append(
-        CardSet::newInstance(&controller, "AAA", "Alpha Set", "core", QDate(2020, 1, 1), CardSet::PriorityPrimary));
-    sets.append(
-        CardSet::newInstance(&controller, "BBB", "Beta Set", "expansion", QDate(2021, 6, 1), CardSet::PriorityPrimary));
-    sets.append(CardSet::newInstance(&controller, "XXX")); // no metadata: ignored
-
-    sets.markAllAsKnownBatched(&controller);
-
-    EXPECT_EQ(controller.individualWrites, 0) << "mark-known must not write per set";
-    EXPECT_EQ(controller.batchedWrites, 1) << "mark-known must persist with a single flush";
-    EXPECT_TRUE(controller.isKnown("AAA"));
-    EXPECT_TRUE(controller.isKnown("BBB"));
-    EXPECT_FALSE(controller.isEnabled("AAA"));
-    EXPECT_FALSE(controller.isEnabled("BBB"));
-    // Ignored sets keep their known state but are enabled.
-    EXPECT_TRUE(controller.isEnabled("XXX"));
-}
 } // namespace
 
 int main(int argc, char **argv)
diff --git a/tests/carddatabase/filter_string_test.cpp b/tests/carddatabase/filter_string_test.cpp
index 95225e28c..dcf1cf0a2 100644
--- a/tests/carddatabase/filter_string_test.cpp
+++ b/tests/carddatabase/filter_string_test.cpp
@@ -1,29 +1,13 @@
-#include "libcockatrice/card/card_localization.h"
-#include "libcockatrice/card/database/card_database.h"
-#include "libcockatrice/card/database/card_database_querier.h"
-#include "libcockatrice/card/set/card_set.h"
+#include "mocks.h"
 #include "test_card_database_path_provider.h"
 
 #include "gtest/gtest.h"
-#include <QDate>
-#include <QHash>
-#include <QList>
-#include <QPair>
-#include <QSharedPointer>
-#include <QString>
 #include <libcockatrice/card/card_info.h>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/card/printing/printing_info.h>
 #include <libcockatrice/filters/filter_string.h>
 #include <libcockatrice/interfaces/noop_card_preference_provider.h>
 #include <libcockatrice/interfaces/noop_card_set_priority_controller.h>
-#include <string>
-#include <utility>
-
-namespace
-{
-class CardQuery;
-}
 
 #define QUERY(name, card, query, match)                                                                                \
     TEST_F(CardQuery, name)                                                                                            \
diff --git a/tests/carddatabase/load_benchmark.cpp b/tests/carddatabase/load_benchmark.cpp
index 5492b9531..8e9e80e4d 100644
--- a/tests/carddatabase/load_benchmark.cpp
+++ b/tests/carddatabase/load_benchmark.cpp
@@ -12,30 +12,25 @@
  * (~/.local/share/Cockatrice/Cockatrice/...).
  */
 
-#include "libcockatrice/card/card_info.h"
-#include "libcockatrice/card/set/card_set_list.h"
+#include "mocks.h"
 
+#include "gtest/gtest.h"
 #include <QAbstractItemModel>
 #include <QCoreApplication>
-#include <QDebug>
+#include <QDateTime>
 #include <QDir>
 #include <QElapsedTimer>
+#include <QEventLoop>
 #include <QFile>
-#include <QHash>
-#include <QList>
 #include <QLoggingCategory>
-#include <QObject>
-#include <QSharedPointer>
-#include <QString>
 #include <QStringList>
-#include <QtGlobal>
+#include <QTimer>
 #include <libcockatrice/card/database/card_database.h>
 #include <libcockatrice/card/database/card_database_loader.h>
 #include <libcockatrice/interfaces/interface_card_database_path_provider.h>
 #include <libcockatrice/interfaces/noop_card_preference_provider.h>
 #include <libcockatrice/interfaces/noop_card_set_priority_controller.h>
 #include <libcockatrice/models/database/card_database_model.h>
-#include <qlogging.h>
 
 static QString defaultXdgPath(const QString &file)
 {
diff --git a/tests/carddatabase/mocks.h b/tests/carddatabase/mocks.h
index b7cfe8243..016642005 100644
--- a/tests/carddatabase/mocks.h
+++ b/tests/carddatabase/mocks.h
@@ -7,7 +7,7 @@
 
 #define PICTURELOADER_H
 
-#include "libcockatrice/card/card_info.h"
+#include <libcockatrice/card/database/card_database.h>
 
 class CardPictureLoader
 {
diff --git a/tests/clamped_arithmetic_test.cpp b/tests/clamped_arithmetic_test.cpp
index e5fd070b0..2471d5870 100644
--- a/tests/clamped_arithmetic_test.cpp
+++ b/tests/clamped_arithmetic_test.cpp
@@ -6,7 +6,6 @@
 #include <gtest/gtest.h>
 #include <libcockatrice/utility/clamped_arithmetic.h>
 #include <limits>
-#include <string>
 
 TEST(AddClamped, AddsWithinBounds)
 {
diff --git a/tests/deck_hash_performance_test.cpp b/tests/deck_hash_performance_test.cpp
index 135c218c5..154283e8e 100644
--- a/tests/deck_hash_performance_test.cpp
+++ b/tests/deck_hash_performance_test.cpp
@@ -1,10 +1,6 @@
 #include "gtest/gtest.h"
-#include <QChar>
-#include <QList>
-#include <QString>
-#include <QStringList>
+#include <QDebug>
 #include <libcockatrice/deck_list/deck_list.h>
-#include <string>
 
 static constexpr int amount = 1e5;
 QString repeatDeck;
diff --git a/tests/deck_list_model/CMakeLists.txt b/tests/deck_list_model/CMakeLists.txt
index cd7d693f3..e3096c559 100644
--- a/tests/deck_list_model/CMakeLists.txt
+++ b/tests/deck_list_model/CMakeLists.txt
@@ -1,23 +1,33 @@
-cockatrice_add_test(
-  NAME
-  deck_list_model_custom_zones_test
-  SOURCES
-  ${VERSION_STRING_CPP}
-  deck_list_model_custom_zones_test.cpp
-  LIBS
-  libcockatrice_models
-  libcockatrice_card
-  libcockatrice_deck_list
-)
+add_executable(deck_list_model_custom_zones_test ${VERSION_STRING_CPP} deck_list_model_custom_zones_test.cpp)
 
-cockatrice_add_test(
-  NAME
-  deck_list_model_zone_integration_test
-  SOURCES
-  ${VERSION_STRING_CPP}
-  deck_list_model_zone_integration_test.cpp
-  LIBS
+if(NOT GTEST_FOUND)
+  add_dependencies(deck_list_model_custom_zones_test gtest)
+endif()
+
+target_link_libraries(
+  deck_list_model_custom_zones_test
   libcockatrice_models
   libcockatrice_card
   libcockatrice_deck_list
+  Threads::Threads
+  ${GTEST_BOTH_LIBRARIES}
+  ${TEST_QT_MODULES}
 )
+add_test(NAME deck_list_model_custom_zones_test COMMAND deck_list_model_custom_zones_test)
+
+add_executable(deck_list_model_zone_integration_test ${VERSION_STRING_CPP} deck_list_model_zone_integration_test.cpp)
+
+if(NOT GTEST_FOUND)
+  add_dependencies(deck_list_model_zone_integration_test gtest)
+endif()
+
+target_link_libraries(
+  deck_list_model_zone_integration_test
+  libcockatrice_models
+  libcockatrice_card
+  libcockatrice_deck_list
+  Threads::Threads
+  ${GTEST_BOTH_LIBRARIES}
+  ${TEST_QT_MODULES}
+)
+add_test(NAME deck_list_model_zone_integration_test COMMAND deck_list_model_zone_integration_test)
diff --git a/tests/deck_list_model/deck_list_model_custom_zones_test.cpp b/tests/deck_list_model/deck_list_model_custom_zones_test.cpp
index 95df74702..7f4ab81e1 100644
--- a/tests/deck_list_model/deck_list_model_custom_zones_test.cpp
+++ b/tests/deck_list_model/deck_list_model_custom_zones_test.cpp
@@ -9,19 +9,10 @@
  * full model and card database machinery.
  */
 
-#include "deck_list_model_custom_zones.h"
-#include "libcockatrice/deck_list/tree/abstract_deck_list_node.h"
-
-#include <QList>
-#include <QString>
-#include <QStringList>
 #include <gtest/gtest.h>
 #include <libcockatrice/deck_list/tree/deck_list_card_node.h>
 #include <libcockatrice/deck_list/tree/inner_deck_list_node.h>
 #include <libcockatrice/models/deck_list/deck_list_model.h>
-#include <qnamespace.h>
-#include <string>
-#include <utility>
 
 namespace
 {
diff --git a/tests/deck_list_model/deck_list_model_zone_integration_test.cpp b/tests/deck_list_model/deck_list_model_zone_integration_test.cpp
index 63c904910..a4562c95d 100644
--- a/tests/deck_list_model/deck_list_model_zone_integration_test.cpp
+++ b/tests/deck_list_model/deck_list_model_zone_integration_test.cpp
@@ -1,12 +1,3 @@
-#include "libcockatrice/card/database/card_database.h"
-#include "libcockatrice/deck_list/tree/abstract_deck_list_node.h"
-
-#include <QList>
-#include <QModelIndex>
-#include <QSharedPointer>
-#include <QString>
-#include <QStringList>
-#include <QVariant>
 #include <gtest/gtest.h>
 #include <libcockatrice/card/card_info.h>
 #include <libcockatrice/card/database/card_database_manager.h>
@@ -17,10 +8,6 @@
 #include <libcockatrice/deck_list/tree/deck_list_card_node.h>
 #include <libcockatrice/deck_list/tree/inner_deck_list_node.h>
 #include <libcockatrice/models/deck_list/deck_list_model.h>
-#include <qnamespace.h>
-#include <string>
-
-class QModelIndex;
 
 namespace
 {
diff --git a/tests/deck_list_zones/CMakeLists.txt b/tests/deck_list_zones/CMakeLists.txt
index 7af8fd187..0710be94d 100644
--- a/tests/deck_list_zones/CMakeLists.txt
+++ b/tests/deck_list_zones/CMakeLists.txt
@@ -1 +1,10 @@
-cockatrice_add_test(NAME deck_list_zones_test SOURCES deck_list_zones_test.cpp LIBS libcockatrice_deck_list)
+add_executable(deck_list_zones_test deck_list_zones_test.cpp)
+
+if(NOT GTEST_FOUND)
+  add_dependencies(deck_list_zones_test gtest)
+endif()
+
+target_link_libraries(
+  deck_list_zones_test libcockatrice_deck_list Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES}
+)
+add_test(NAME deck_list_zones_test COMMAND deck_list_zones_test)
diff --git a/tests/deck_list_zones/deck_list_zones_test.cpp b/tests/deck_list_zones/deck_list_zones_test.cpp
index 1903b70df..801f226a9 100644
--- a/tests/deck_list_zones/deck_list_zones_test.cpp
+++ b/tests/deck_list_zones/deck_list_zones_test.cpp
@@ -7,20 +7,12 @@
  * "main" are still mainboard cards for hashing, sideboard size, legality and export.
  */
 
-#include "libcockatrice/deck_list/tree/abstract_deck_list_node.h"
-
-#include <QList>
-#include <QSet>
-#include <QSharedPointer>
-#include <QString>
 #include <QStringList>
-#include <functional>
 #include <gtest/gtest.h>
 #include <libcockatrice/deck_list/deck_list.h>
 #include <libcockatrice/deck_list/deck_list_node_tree.h>
 #include <libcockatrice/deck_list/tree/deck_list_card_node.h>
 #include <libcockatrice/deck_list/tree/inner_deck_list_node.h>
-#include <string>
 
 namespace
 {
diff --git a/tests/dummy_test.cpp b/tests/dummy_test.cpp
new file mode 100644
index 000000000..31a01bcff
--- /dev/null
+++ b/tests/dummy_test.cpp
@@ -0,0 +1,19 @@
+#include "gtest/gtest.h"
+
+namespace
+{
+class FooTest : public ::testing::Test
+{
+};
+
+TEST(DummyTest, Works)
+{
+    ASSERT_EQ(1, 1) << "One is not equal to one";
+}
+} // namespace
+
+int main(int argc, char **argv)
+{
+    ::testing::InitGoogleTest(&argc, argv);
+    return RUN_ALL_TESTS();
+}
\ No newline at end of file
diff --git a/tests/expression_test.cpp b/tests/expression_test.cpp
index b3c4b586c..4fbe98cb9 100644
--- a/tests/expression_test.cpp
+++ b/tests/expression_test.cpp
@@ -1,7 +1,6 @@
 #include "gtest/gtest.h"
 #include <QtMath>
 #include <libcockatrice/utility/expression.h>
-#include <string>
 
 #define TEST_EXPR(name, a, b)                                                                                          \
     TEST(ExpressionTest, name)                                                                                         \
diff --git a/tests/lag_monitor_test.cpp b/tests/lag_monitor_test.cpp
index b404a2c9e..9948eeabb 100644
--- a/tests/lag_monitor_test.cpp
+++ b/tests/lag_monitor_test.cpp
@@ -5,8 +5,6 @@
 #include <QEvent>
 #include <QLoggingCategory>
 #include <gtest/gtest.h>
-#include <qnumeric.h>
-#include <string>
 
 namespace
 {
diff --git a/tests/latency_tracker_test.cpp b/tests/latency_tracker_test.cpp
index a77051799..68631b7ca 100644
--- a/tests/latency_tracker_test.cpp
+++ b/tests/latency_tracker_test.cpp
@@ -1,9 +1,5 @@
-#include <QList>
-#include <QtGlobal>
 #include <gtest/gtest.h>
-#include <initializer_list>
 #include <libcockatrice/network/client/abstract/latency_tracker.h>
-#include <string>
 
 TEST(LatencyTrackerTest, EmptyTrackerYieldsZeroedStats)
 {
diff --git a/tests/loader_local_matching_test.cpp b/tests/loader_local_matching_test.cpp
index 13d3e5bb3..6ce684fdd 100644
--- a/tests/loader_local_matching_test.cpp
+++ b/tests/loader_local_matching_test.cpp
@@ -1,11 +1,7 @@
 #include "client/settings/cache_settings.h"
 #include "interface/card_picture_loader/card_picture_loader_local.h"
-#include "libcockatrice/card/card_info.h"
-#include "libcockatrice/card/printing/printing_info.h"
 
 #include "gtest/gtest.h"
-#include <QByteArray>
-#include <QByteArrayView>
 #include <QColor>
 #include <QCoreApplication>
 #include <QDir>
@@ -13,18 +9,13 @@
 #include <QImage>
 #include <QImageWriter>
 #include <QLoggingCategory>
-#include <QSharedPointer>
 #include <QStandardPaths>
-#include <QString>
 #include <QTemporaryDir>
-#include <QtGlobal>
 #include <libcockatrice/card/lazy_properties_hash.h>
 #include <libcockatrice/card/printing/exact_card.h>
 #include <libcockatrice/card/set/card_set.h>
 #include <libcockatrice/interfaces/noop_card_set_priority_controller.h>
 #include <libcockatrice/settings/paths_settings.h>
-#include <qnamespace.h>
-#include <string>
 
 namespace
 {
diff --git a/tests/loading_from_clipboard/CMakeLists.txt b/tests/loading_from_clipboard/CMakeLists.txt
index 88711e457..719d62f45 100644
--- a/tests/loading_from_clipboard/CMakeLists.txt
+++ b/tests/loading_from_clipboard/CMakeLists.txt
@@ -1,13 +1,12 @@
 add_definitions("-DCARDDB_DATADIR=\"${CMAKE_CURRENT_SOURCE_DIR}/data/\"")
+add_executable(loading_from_clipboard_test ${VERSION_STRING_CPP} clipboard_testing.cpp loading_from_clipboard_test.cpp)
 
-cockatrice_add_test(
-  NAME
-  loading_from_clipboard_test
-  SOURCES
-  ${VERSION_STRING_CPP}
-  clipboard_testing.cpp
-  loading_from_clipboard_test.cpp
-  LIBS
-  libcockatrice_deck_list
-  libcockatrice_card
+if(NOT GTEST_FOUND)
+  add_dependencies(loading_from_clipboard_test gtest)
+endif()
+
+target_link_libraries(
+  loading_from_clipboard_test libcockatrice_deck_list libcockatrice_card Threads::Threads ${GTEST_BOTH_LIBRARIES}
+  ${TEST_QT_MODULES}
 )
+add_test(NAME loading_from_clipboard_test COMMAND loading_from_clipboard_test)
diff --git a/tests/loading_from_clipboard/clipboard_testing.cpp b/tests/loading_from_clipboard/clipboard_testing.cpp
index 3f652a495..a9977b800 100644
--- a/tests/loading_from_clipboard/clipboard_testing.cpp
+++ b/tests/loading_from_clipboard/clipboard_testing.cpp
@@ -1,12 +1,6 @@
 #include "clipboard_testing.h"
 
-#include "libcockatrice/deck_list/deck_list.h"
-#include "libcockatrice/deck_list/tree/inner_deck_list_node.h"
-
-#include <QSharedPointer>
 #include <QTextStream>
-#include <functional>
-#include <gtest/gtest.h>
 #include <libcockatrice/card/import/card_name_normalizer.h>
 #include <libcockatrice/deck_list/tree/deck_list_card_node.h>
 
diff --git a/tests/loading_from_clipboard/clipboard_testing.h b/tests/loading_from_clipboard/clipboard_testing.h
index c9852e5d7..41d8ea794 100644
--- a/tests/loading_from_clipboard/clipboard_testing.h
+++ b/tests/loading_from_clipboard/clipboard_testing.h
@@ -1,11 +1,8 @@
 #ifndef CLIPBOARD_TESTING_H
 #define CLIPBOARD_TESTING_H
 
-#include <QList>
-#include <QString>
-#include <QVector>
-#include <string>
-#include <utility>
+#include "gtest/gtest.h"
+#include <libcockatrice/deck_list/deck_list.h>
 
 // using std types because qt types aren't understood by gtest (without this you'll get less nice errors)
 using CardRows = QVector<std::pair<std::string, int>>;
diff --git a/tests/loading_from_clipboard/loading_from_clipboard_test.cpp b/tests/loading_from_clipboard/loading_from_clipboard_test.cpp
index e1797818e..fcfbb22db 100644
--- a/tests/loading_from_clipboard/loading_from_clipboard_test.cpp
+++ b/tests/loading_from_clipboard/loading_from_clipboard_test.cpp
@@ -1,11 +1,5 @@
 #include "clipboard_testing.h"
 
-#include <QList>
-#include <QString>
-#include <gtest/gtest.h>
-#include <string>
-#include <utility>
-
 // Testing is done by using the DeckList::loadFromString_Plain function in common/decklist.h
 // It does not check if cards are in the database at all, so no comparisons to the database will be made.
 
@@ -80,20 +74,6 @@ TEST(LoadingFromClipboardTest, WeirdWhitespaceIsIgnored)
     testDeck(clipboard, result);
 }
 
-TEST(LoadingFromClipboardTest, TabSeparatedImport)
-{
-    QString clipboard("2\tMystic Snake\tStreets of New Capenna\n"
-                      "3x\tCounterspell\tNPH\n"
-                      "\t2\tSol Ring\tFMB\n"
-                      "1\tForest\n"
-                      "\n"
-                      "2x\tDoom Blade\tM11\n");
-
-    Result result("", "", {{"Mystic Snake", 2}, {"Counterspell", 3}, {"Sol Ring", 2}, {"Forest", 1}},
-                  {{"Doom Blade", 2}});
-    testDeck(clipboard, result);
-}
-
 TEST(LoadingFromClipboardTest, RemoveBlankEntriesFromBeginningAndEnd)
 {
     QString clipboard("\n"
diff --git a/tests/metrics_registry_test.cpp b/tests/metrics_registry_test.cpp
index 39a8f8aaf..1abef58e1 100644
--- a/tests/metrics_registry_test.cpp
+++ b/tests/metrics_registry_test.cpp
@@ -2,7 +2,6 @@
 #include <QList>
 #include <gtest/gtest.h>
 #include <metrics_registry.h>
-#include <string>
 
 TEST(MetricsRegistryTest, EmptyRegistryHasZeroedCounters)
 {
diff --git a/tests/movecard_tests/CMakeLists.txt b/tests/movecard_tests/CMakeLists.txt
index 68d8fc84c..769047148 100755
--- a/tests/movecard_tests/CMakeLists.txt
+++ b/tests/movecard_tests/CMakeLists.txt
@@ -1,11 +1,16 @@
-cockatrice_add_test(
-  NAME
+add_executable(reverse_card_move_test reverse_card_move_test.cpp)
+
+if(NOT GTEST_FOUND)
+  add_dependencies(reverse_card_move_test gtest)
+endif()
+
+target_link_libraries(
   reverse_card_move_test
-  SOURCES
-  reverse_card_move_test.cpp
-  LIBS
-  libcockatrice_network_server_remote
-  libcockatrice_rng
-  LABELS
-  server
+  PRIVATE libcockatrice_network_server_remote
+  PRIVATE libcockatrice_rng
+  PRIVATE Threads::Threads
+  PRIVATE ${GTEST_BOTH_LIBRARIES}
+  PRIVATE ${TEST_QT_MODULES}
 )
+
+add_test(NAME reverse_card_move_test COMMAND reverse_card_move_test)
diff --git a/tests/movecard_tests/reverse_card_move_test.cpp b/tests/movecard_tests/reverse_card_move_test.cpp
index 6bed20d18..64c93078c 100644
--- a/tests/movecard_tests/reverse_card_move_test.cpp
+++ b/tests/movecard_tests/reverse_card_move_test.cpp
@@ -3,20 +3,15 @@
 #include "game/server_card.h"
 #include "game/server_cardzone.h"
 #include "game/server_game.h"
-#include "libcockatrice/protocol/pb/response.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_zone.pb.h"
 #include "server_response_containers.h"
 #include "server_room.h"
 #include "server_test_helpers.h"
 
-#include <QList>
-#include <QString>
 #include <gtest/gtest.h>
 #include <libcockatrice/protocol/pb/command_move_card.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
 #include <libcockatrice/rng/rng_abstract.h>
 #include <libcockatrice/utility/zone_names.h>
-#include <string>
 
 RNG_Abstract *rng = nullptr; // this needs to be defined due to other functions in server
 
diff --git a/tests/oracle/CMakeLists.txt b/tests/oracle/CMakeLists.txt
index 6958673f7..9bc5ee5be 100644
--- a/tests/oracle/CMakeLists.txt
+++ b/tests/oracle/CMakeLists.txt
@@ -1,32 +1,37 @@
-cockatrice_add_test(NAME parse_cipt_test SOURCES ../../oracle/src/parsehelpers.cpp parse_cipt_test.cpp)
+add_executable(parse_cipt_test ../../oracle/src/parsehelpers.cpp parse_cipt_test.cpp)
+
+if(NOT GTEST_FOUND)
+  add_dependencies(parse_cipt_test gtest)
+endif()
+
+target_link_libraries(parse_cipt_test Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES})
+
+add_test(NAME parse_cipt_test COMMAND parse_cipt_test)
 
 # Oracle importer unit tests
-cockatrice_add_test(
-  NAME
-  oracle_importer_test
-  SOURCES
-  ${VERSION_STRING_CPP}
-  ../../oracle/src/oracleimporter.cpp
-  ../../oracle/src/parsehelpers.cpp
-  ../../oracle/src/raw_json_scanner.cpp
-  oracle_importer_test.cpp
-  LIBS
-  libcockatrice_card
-  libcockatrice_interfaces
+add_executable(
+  oracle_importer_test ${VERSION_STRING_CPP} ../../oracle/src/oracleimporter.cpp ../../oracle/src/parsehelpers.cpp
+                       ../../oracle/src/raw_json_scanner.cpp oracle_importer_test.cpp
 )
 
+if(NOT GTEST_FOUND)
+  add_dependencies(oracle_importer_test gtest)
+endif()
+
+target_link_libraries(
+  oracle_importer_test libcockatrice_card libcockatrice_interfaces Threads::Threads ${GTEST_BOTH_LIBRARIES}
+  ${TEST_QT_MODULES}
+)
+
+add_test(NAME oracle_importer_test COMMAND oracle_importer_test)
+
 # Oracle importer benchmark tests (manual, not run in CI, incl. RAM benchmark)
 # Optional compression libs, mirrored from oracle/CMakeLists.txt, so the benchmark
 # can download and decompress whatever AllPrintings format the default URL selects.
-# add_definitions() is directory-scoped and order-independent, so HAS_ZLIB/HAS_LZMA also
-# reach the two unit tests above. That is harmless: those macros gate code only in
-# oracle/src/pages.cpp and oracle/src/pagetemplates.cpp, which no test target compiles.
 find_package(ZLIB)
 if(ZLIB_FOUND)
   add_definitions("-DHAS_ZLIB")
   set(_ORACLE_BENCH_EXTRA_SOURCES ../../oracle/src/zip/unzip.cpp ../../oracle/src/zip/zipglobal.cpp)
-  cockatrice_disable_sanitizers_for(${_ORACLE_BENCH_EXTRA_SOURCES})
-  cockatrice_disable_coverage_for(${_ORACLE_BENCH_EXTRA_SOURCES})
   set(_ORACLE_BENCH_EXTRA_LIBRARIES ${ZLIB_LIBRARIES})
   include_directories(${ZLIB_INCLUDE_DIRS})
 else()
@@ -37,28 +42,28 @@ find_package(LibLZMA)
 if(LIBLZMA_FOUND)
   add_definitions("-DHAS_LZMA")
   list(APPEND _ORACLE_BENCH_EXTRA_SOURCES ../../oracle/src/lzma/decompress.cpp)
-  cockatrice_disable_sanitizers_for(../../oracle/src/lzma/decompress.cpp)
-  cockatrice_disable_coverage_for(../../oracle/src/lzma/decompress.cpp)
   list(APPEND _ORACLE_BENCH_EXTRA_LIBRARIES ${LIBLZMA_LIBRARIES})
   include_directories(${LIBLZMA_INCLUDE_DIRS})
 else()
   message(STATUS "Oracle tests: LibLZMA not found; xz download benchmark disabled")
 endif()
 
-cockatrice_add_manual_test(
-  NAME
+add_executable(
+  oracle_importer_benchmark_test
+  ${VERSION_STRING_CPP} ../../oracle/src/oracleimporter.cpp ../../oracle/src/parsehelpers.cpp
+  ../../oracle/src/raw_json_scanner.cpp oracle_importer_benchmark_test.cpp ${_ORACLE_BENCH_EXTRA_SOURCES}
+)
+
+if(NOT GTEST_FOUND)
+  add_dependencies(oracle_importer_benchmark_test gtest)
+endif()
+
+target_link_libraries(
   oracle_importer_benchmark_test
-  SOURCES
-  ${VERSION_STRING_CPP}
-  ../../oracle/src/oracleimporter.cpp
-  ../../oracle/src/parsehelpers.cpp
-  ../../oracle/src/raw_json_scanner.cpp
-  oracle_importer_benchmark_test.cpp
-  ${_ORACLE_BENCH_EXTRA_SOURCES}
-  LIBS
   libcockatrice_card
   libcockatrice_interfaces
-  EXTRA_LIBS
+  Threads::Threads
+  ${GTEST_BOTH_LIBRARIES}
+  ${TEST_QT_MODULES}
   ${_ORACLE_BENCH_EXTRA_LIBRARIES}
-  MANUAL
 )
diff --git a/tests/oracle/oracle_importer_benchmark_test.cpp b/tests/oracle/oracle_importer_benchmark_test.cpp
index c2a4aaf4b..633c9e40a 100644
--- a/tests/oracle/oracle_importer_benchmark_test.cpp
+++ b/tests/oracle/oracle_importer_benchmark_test.cpp
@@ -1,37 +1,21 @@
 #include "../../oracle/src/oracleimporter.h"
-#include "libcockatrice/card/card_info.h"
-#include "libcockatrice/card/set/card_set.h"
 
 #include "gtest/gtest.h"
 #include <QBuffer>
-#include <QByteArray>
-#include <QChar>
 #include <QCoreApplication>
 #include <QDebug>
 #include <QElapsedTimer>
 #include <QEventLoop>
 #include <QFile>
-#include <QIODevice>
 #include <QJsonArray>
 #include <QJsonDocument>
 #include <QJsonObject>
-#include <QJsonValue>
-#include <QJsonValueRef>
-#include <QList>
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
 #include <QNetworkRequest>
-#include <QObject>
-#include <QSharedPointer>
-#include <QString>
 #include <QTimer>
 #include <QUrl>
-#include <QtGlobal>
 #include <libcockatrice/interfaces/noop_card_set_priority_controller.h>
-#include <qlogging.h>
-#include <qsystemdetection.h>
-#include <string>
-#include <utility>
 
 #if defined(HAS_LZMA)
 #include "../../oracle/src/lzma/decompress.h"
@@ -62,10 +46,12 @@ static QByteArray buildSyntheticData(int numSets, int cardsPerSet)
             card["colors"] = QJsonArray{"W"};
             card["colorIdentity"] = QJsonArray{"W"};
             card["types"] = QJsonArray{"Creature"};
-            // Real MTGJSON types: floats, not strings. This
+            // Real MTGJSON types: floats and booleans, not strings. This
             // exercises the QVariant coercion in the property reader.
             card["convertedManaCost"] = 1.0;
             card["manaValue"] = 1.0;
+            card["isOnlineOnly"] = false;
+            card["isRebalanced"] = false;
 
             QJsonObject legalities;
             legalities["standard"] = "legal";
diff --git a/tests/oracle/oracle_importer_test.cpp b/tests/oracle/oracle_importer_test.cpp
index 83d77d465..f66616e37 100644
--- a/tests/oracle/oracle_importer_test.cpp
+++ b/tests/oracle/oracle_importer_test.cpp
@@ -1,34 +1,15 @@
 #include "../../oracle/src/oracleimporter.h"
-#include "../../oracle/src/raw_json_scanner.h"
-#include "libcockatrice/card/card_info.h"
 
 #include "gtest/gtest.h"
-#include <QByteArray>
-#include <QChar>
-#include <QDate>
 #include <QJsonArray>
 #include <QJsonDocument>
 #include <QJsonObject>
-#include <QJsonParseError>
-#include <QJsonValue>
-#include <QJsonValueRef>
-#include <QList>
-#include <QMap>
 #include <QObject>
 #include <QPair>
-#include <QRegularExpression>
-#include <QRegularExpressionMatch>
-#include <QSharedPointer>
-#include <QString>
-#include <QUuid>
-#include <QVariant>
-#include <QVariantMap>
-#include <QtGlobal>
+#include <QSet>
 #include <libcockatrice/card/format/format_legality_rules.h>
 #include <libcockatrice/card/set/card_set.h>
 #include <libcockatrice/interfaces/noop_card_set_priority_controller.h>
-#include <string>
-#include <utility>
 
 class OracleImporterTest : public ::testing::Test
 {
diff --git a/tests/oracle/parse_cipt_test.cpp b/tests/oracle/parse_cipt_test.cpp
index 10268d659..f5036f962 100644
--- a/tests/oracle/parse_cipt_test.cpp
+++ b/tests/oracle/parse_cipt_test.cpp
@@ -1,7 +1,6 @@
 #include "../../oracle/src/parsehelpers.h"
 
 #include "gtest/gtest.h"
-#include <string>
 
 TEST(ParseCiptTest, parsesThisEntersTapped)
 {
diff --git a/tests/password_hash_test.cpp b/tests/password_hash_test.cpp
index 2a504b81c..2b8f8bdb7 100644
--- a/tests/password_hash_test.cpp
+++ b/tests/password_hash_test.cpp
@@ -1,9 +1,6 @@
 #include "gtest/gtest.h"
-#include <QChar>
-#include <QString>
 #include <cstring>
 #include <libcockatrice/utility/passwordhasher.h>
-#include <string>
 
 namespace
 {
diff --git a/tests/picture_loader_benchmark/CMakeLists.txt b/tests/picture_loader_benchmark/CMakeLists.txt
index 0684f58f4..a3b75fe88 100644
--- a/tests/picture_loader_benchmark/CMakeLists.txt
+++ b/tests/picture_loader_benchmark/CMakeLists.txt
@@ -1,10 +1,8 @@
-# Manual benchmark hitting the real card image hosts. Not registered with CTest: it requires a
-# cards.xml, touches the network for minutes at a time, and needs network access. Build it
-# explicitly and run by hand.
-cockatrice_add_manual_test(
-  NAME
+# Manual benchmark hitting the real card image hosts. Not registered with
+# add_test(): it requires a cards.xml, touches the network for minutes at a
+# time, and needs network access. Build it explicitly and run by hand.
+add_executable(
   picture_loader_benchmark_test
-  SOURCES
   ${VERSION_STRING_CPP}
   ../../cockatrice/src/interface/card_picture_loader/card_picture_loader_local.cpp
   ../../cockatrice/src/interface/card_picture_loader/card_picture_to_load.cpp
@@ -13,12 +11,16 @@ cockatrice_add_manual_test(
   ../../cockatrice/src/client/settings/cache_settings.h
   picture_loader_benchmark.cpp
   settings_cache_mock.cpp
-  LIBS
+)
+
+target_include_directories(picture_loader_benchmark_test PRIVATE ${CMAKE_SOURCE_DIR}/cockatrice/src)
+
+target_link_libraries(
+  picture_loader_benchmark_test
   libcockatrice_card
   libcockatrice_settings
   libcockatrice_interfaces
   libcockatrice_utility
-  INCLUDE_DIRS
-  ${CMAKE_SOURCE_DIR}/cockatrice/src
-  MANUAL
+  Threads::Threads
+  ${TEST_QT_MODULES}
 )
diff --git a/tests/picture_loader_benchmark/picture_loader_benchmark.cpp b/tests/picture_loader_benchmark/picture_loader_benchmark.cpp
index 587cef65f..f991f2ec0 100644
--- a/tests/picture_loader_benchmark/picture_loader_benchmark.cpp
+++ b/tests/picture_loader_benchmark/picture_loader_benchmark.cpp
@@ -25,34 +25,22 @@
 #include "client/settings/cache_settings.h"
 #include "interface/card_picture_loader/card_picture_loader_worker.h"
 #include "interface/card_picture_loader/card_picture_to_load.h"
-#include "libcockatrice/card/card_info.h"
-#include "libcockatrice/card/database/card_database_loader.h"
 
-#include <QByteArrayView>
 #include <QCoreApplication>
 #include <QDir>
 #include <QElapsedTimer>
 #include <QEventLoop>
 #include <QFile>
-#include <QFlags>
 #include <QImage>
-#include <QLatin1String>
 #include <QList>
 #include <QMessageLogContext>
 #include <QMetaType>
 #include <QMutex>
-#include <QMutexLocker>
-#include <QObject>
-#include <QSharedPointer>
-#include <QString>
-#include <QStringList>
-#include <QStringLiteral>
 #include <QTemporaryDir>
 #include <QThread>
 #include <QTimer>
 #include <QUrl>
-#include <QtGlobal>
-#include <QtMessageHandler>
+#include <QtLogging>
 #include <atomic>
 #include <cstdio>
 #include <libcockatrice/card/database/card_database.h>
@@ -63,8 +51,6 @@
 #include <libcockatrice/interfaces/noop_card_set_priority_controller.h>
 #include <libcockatrice/settings/download_settings.h>
 #include <optional>
-#include <qsystemdetection.h>
-#include <utility>
 
 class BenchmarkCardDatabasePathProvider : public ICardDatabasePathProvider
 {
diff --git a/tests/picture_loader_benchmark/settings_cache_mock.cpp b/tests/picture_loader_benchmark/settings_cache_mock.cpp
index 13e831b62..d93c7e002 100644
--- a/tests/picture_loader_benchmark/settings_cache_mock.cpp
+++ b/tests/picture_loader_benchmark/settings_cache_mock.cpp
@@ -17,21 +17,15 @@
 #include "client/settings/cache_settings.h"
 #include "interface/card_picture_loader/card_picture_loader_cache_method.h"
 
-#include <QDebug>
 #include <QDir>
 #include <QFile>
-#include <QLoggingCategory>
-#include <QMessageLogger>
 #include <QSettings>
-#include <QSharedPointer>
 #include <QStandardPaths>
-#include <QString>
-#include <QVariant>
 #include <libcockatrice/settings/cache_storage_settings.h>
 #include <libcockatrice/settings/cards_display_settings.h>
 #include <libcockatrice/settings/download_settings.h>
 #include <libcockatrice/settings/paths_settings.h>
-#include <qtmetamacros.h>
+#include <utility>
 
 QString SettingsCache::getDataPath()
 {
diff --git a/tests/playmat_resolver_test.cpp b/tests/playmat_resolver_test.cpp
index 6730ec137..a931c0647 100644
--- a/tests/playmat_resolver_test.cpp
+++ b/tests/playmat_resolver_test.cpp
@@ -1,15 +1,6 @@
-#include "libcockatrice/interfaces/interface_interface_settings_provider.h"
-#include "libcockatrice/utility/card_ref.h"
-#include "libcockatrice/utility/playmat_params.h"
-
-#include <QList>
-#include <QString>
-#include <QStringList>
-#include <QStringLiteral>
 #include <gtest/gtest.h>
 #include <libcockatrice/deck_list/deck_list.h>
 #include <libcockatrice/deck_list/playmat_resolver.h>
-#include <string>
 
 namespace
 {
diff --git a/tests/report_categories_test.cpp b/tests/report_categories_test.cpp
index 1e08938db..790b2cff6 100644
--- a/tests/report_categories_test.cpp
+++ b/tests/report_categories_test.cpp
@@ -3,7 +3,6 @@
 #include <QString>
 #include <QStringList>
 #include <libcockatrice/utility/report_categories.h>
-#include <string>
 
 TEST(ReportCategoriesTest, CanonicalListIsNonEmptyAndStable)
 {
diff --git a/tests/server_card_counter_test.cpp b/tests/server_card_counter_test.cpp
index 6308d80b9..c8bc43f8f 100644
--- a/tests/server_card_counter_test.cpp
+++ b/tests/server_card_counter_test.cpp
@@ -3,14 +3,12 @@
  *  @ingroup Tests
  */
 
-#include <QMap>
-#include <QString>
 #include <gtest/gtest.h>
 #include <libcockatrice/network/server/remote/game/server_card.h>
 #include <libcockatrice/protocol/pb/event_set_card_counter.pb.h>
 #include <libcockatrice/utility/card_ref.h>
 #include <libcockatrice/utility/counter_limits.h>
-#include <string>
+#include <limits>
 
 TEST(ServerCardCounter, IncrementNewCounter)
 {
diff --git a/tests/server_counter_test.cpp b/tests/server_counter_test.cpp
index 492aecf66..0f41f2cbd 100644
--- a/tests/server_counter_test.cpp
+++ b/tests/server_counter_test.cpp
@@ -3,13 +3,9 @@
  *  @ingroup Tests
  */
 
-#include "libcockatrice/protocol/pb/color.pb.h"
-
-#include <QString>
 #include <gtest/gtest.h>
 #include <libcockatrice/network/server/remote/game/server_counter.h>
 #include <limits>
-#include <string>
 
 TEST(ServerCounter, IncrementDoesNotOverflow)
 {
diff --git a/tests/server_developer_role_test.cpp b/tests/server_developer_role_test.cpp
index c77fc5b21..127f606a8 100644
--- a/tests/server_developer_role_test.cpp
+++ b/tests/server_developer_role_test.cpp
@@ -3,10 +3,6 @@
  *  @ingroup Tests
  */
 
-#include "libcockatrice/protocol/pb/response.pb.h"
-#include "libcockatrice/protocol/pb/server_message.pb.h"
-
-#include <QString>
 #include <gtest/gtest.h>
 #include <libcockatrice/network/server/remote/server.h>
 #include <libcockatrice/network/server/remote/server_protocolhandler.h>
@@ -15,8 +11,6 @@
 #include <libcockatrice/protocol/pb/developer_commands.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
 #include <libcockatrice/rng/rng_abstract.h>
-#include <stdint.h>
-#include <string>
 
 // The server_remote library references the global RNG, which is normally
 // defined by the servatrice/client executable main(). Provide a stub so the
diff --git a/tests/server_dump_zone_test.cpp b/tests/server_dump_zone_test.cpp
deleted file mode 100644
index 71c410655..000000000
--- a/tests/server_dump_zone_test.cpp
+++ /dev/null
@@ -1,125 +0,0 @@
-/** @file server_dump_zone_test.cpp
- *  @brief Tests for resolving a client's zone dump request against a zone's card count.
- *  @ingroup Tests
- */
-
-#include <QList>
-#include <climits>
-#include <gtest/gtest.h>
-#include <libcockatrice/network/server/remote/game/dump_zone_range.h>
-#include <vector>
-
-namespace
-{
-/// Indices a dump request resolves to, as the handler would walk them.
-std::vector<qsizetype> walked(qsizetype cardCount, int numberCards, bool isReversed)
-{
-    const auto [begin, end] = dumpZoneCardRange(cardCount, numberCards, isReversed);
-    std::vector<qsizetype> out;
-    for (qsizetype i = begin; i < end; ++i) {
-        out.push_back(i);
-    }
-    return out;
-}
-} // namespace
-
-TEST(ServerDumpZone, ForwardTakesLeadingCards)
-{
-    EXPECT_EQ(walked(5, 2, false), (std::vector<qsizetype>{0, 1}));
-}
-
-TEST(ServerDumpZone, ForwardTakingAllCardsCoversTheZone)
-{
-    EXPECT_EQ(walked(3, 3, false), (std::vector<qsizetype>{0, 1, 2}));
-}
-
-TEST(ServerDumpZone, ForwardAskingForOneDumpsOne)
-{
-    EXPECT_EQ(walked(3, 1, false), (std::vector<qsizetype>{0}));
-}
-
-TEST(ServerDumpZone, MinusOneMeansTheWholeZone)
-{
-    EXPECT_EQ(walked(4, -1, false), (std::vector<qsizetype>{0, 1, 2, 3}));
-}
-
-TEST(ServerDumpZone, ReversedTakesTrailingCards)
-{
-    EXPECT_EQ(walked(5, 2, true), (std::vector<qsizetype>{3, 4}));
-}
-
-TEST(ServerDumpZone, ReversedAskingForOneTakesTheLast)
-{
-    EXPECT_EQ(walked(5, 1, true), (std::vector<qsizetype>{4}));
-}
-
-TEST(ServerDumpZone, ZeroDumpsNothing)
-{
-    EXPECT_TRUE(walked(5, 0, false).empty());
-    EXPECT_TRUE(walked(5, 0, true).empty());
-}
-
-// A request for more cards than the zone holds is clamped rather than walked off the end.
-// Forward, the old loop stopped at the zone's size on its own.
-TEST(ServerDumpZone, ForwardOversizedRequestIsClamped)
-{
-    EXPECT_EQ(walked(3, 1000, false), (std::vector<qsizetype>{0, 1, 2}));
-}
-
-// Reversed, an oversized request put the offset at cardCount - numberCards, which is
-// negative, so the walk started before the first card.
-TEST(ServerDumpZone, ReversedOversizedRequestIsClamped)
-{
-    EXPECT_EQ(walked(3, 1000, true), (std::vector<qsizetype>{0, 1, 2}));
-}
-
-// Reversed, -1 put the offset at cardCount + 1, so the walk started one past the last card.
-TEST(ServerDumpZone, ReversedWholeZoneRequestStaysInRange)
-{
-    EXPECT_EQ(walked(3, -1, true), (std::vector<qsizetype>{0, 1, 2}));
-}
-
-// Only -1 means "the whole zone". Any other negative count is not a request for anything,
-// so it resolves to an empty range rather than to the whole zone.
-TEST(ServerDumpZone, OtherNegativeCountsDumpNothing)
-{
-    EXPECT_TRUE(walked(5, -2, false).empty());
-    EXPECT_TRUE(walked(5, -2, true).empty());
-    EXPECT_TRUE(walked(5, INT_MIN, true).empty());
-}
-
-TEST(ServerDumpZone, EmptyZoneYieldsAnEmptyRange)
-{
-    EXPECT_TRUE(walked(0, -1, false).empty());
-    EXPECT_TRUE(walked(0, -1, true).empty());
-    EXPECT_TRUE(walked(0, 10, false).empty());
-    EXPECT_TRUE(walked(0, 10, true).empty());
-}
-
-TEST(ServerDumpZone, NonPositiveCardCountYieldsAnEmptyRange)
-{
-    EXPECT_TRUE(walked(-1, -1, false).empty());
-    EXPECT_TRUE(walked(-1, -1, true).empty());
-}
-
-// The invariant the handler depends on: whatever a client asks for, the indices it walks
-// are a subset of the zone's cards and never step outside the list. number_cards is an
-// unbounded client-supplied sint32, so this sweeps the edges rather than a chosen few.
-TEST(ServerDumpZone, ResolvedRangeIsAlwaysWithinTheZone)
-{
-    const QList<int> cardCounts = {0, 1, 2, 3, 7, 60, 1000000};
-    const QList<int> requests = {INT_MIN, -1000, -2, -1, 0, 1, 2, 3, 59, 60, 61, 999999, INT_MAX};
-
-    for (int cardCount : cardCounts) {
-        for (int request : requests) {
-            for (bool isReversed : {false, true}) {
-                const auto [begin, end] = dumpZoneCardRange(cardCount, request, isReversed);
-                SCOPED_TRACE(testing::Message()
-                             << "cardCount=" << cardCount << " request=" << request << " isReversed=" << isReversed);
-                ASSERT_GE(begin, 0);
-                ASSERT_GE(end, begin);
-                ASSERT_LE(end, cardCount);
-            }
-        }
-    }
-}
diff --git a/tests/server_game_join_test.cpp b/tests/server_game_join_test.cpp
index 8a2ae8c45..c84e4e066 100644
--- a/tests/server_game_join_test.cpp
+++ b/tests/server_game_join_test.cpp
@@ -3,19 +3,14 @@
  *  @ingroup Tests
  */
 
-#include "game/game_config.h"
 #include "game/server_game.h"
-#include "libcockatrice/protocol/pb/response.pb.h"
 #include "server.h"
 #include "server_database_interface.h"
 #include "server_room.h"
 
-#include <QList>
-#include <QString>
 #include <gtest/gtest.h>
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
 #include <libcockatrice/rng/rng_abstract.h>
-#include <string>
 
 RNG_Abstract *rng = nullptr; // referenced by the server_remote library
 
diff --git a/tests/server_moderator_role_test.cpp b/tests/server_moderator_role_test.cpp
deleted file mode 100644
index 2517a2d86..000000000
--- a/tests/server_moderator_role_test.cpp
+++ /dev/null
@@ -1,156 +0,0 @@
-/** @file server_moderator_role_test.cpp
- *  @brief Tests for the moderator staff role authorization and dispatch.
- *  @ingroup Tests
- */
-
-#include "libcockatrice/protocol/pb/response.pb.h"
-#include "libcockatrice/protocol/pb/server_message.pb.h"
-
-#include <QString>
-#include <gtest/gtest.h>
-#include <libcockatrice/network/server/remote/server.h>
-#include <libcockatrice/network/server/remote/server_protocolhandler.h>
-#include <libcockatrice/protocol/pb/command_report_reopen.pb.h>
-#include <libcockatrice/protocol/pb/commands.pb.h>
-#include <libcockatrice/protocol/pb/moderator_commands.pb.h>
-#include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
-#include <libcockatrice/rng/rng_abstract.h>
-#include <stdint.h>
-#include <string>
-
-// The server_remote library references the global RNG, which is normally
-// defined by the servatrice/client executable main(). Provide a stub so the
-// unit test can link against it.
-RNG_Abstract *rng = nullptr;
-
-namespace
-{
-
-class TestModeratorHandler : public Server_ProtocolHandler
-{
-public:
-    explicit TestModeratorHandler(Server *_server) : Server_ProtocolHandler(_server, nullptr)
-    {
-    }
-
-    QString getAddress() const override
-    {
-        return {};
-    }
-    QString getConnectionType() const override
-    {
-        return {};
-    }
-
-    // Buffer the last response code sent to the client so tests can assert on
-    // the outcome of processCommandContainer().
-    Response::ResponseCode lastResponseCode = Response::RespNothing;
-    int dispatchCount = 0;
-
-protected:
-    void transmitProtocolItem(const ServerMessage &item) override
-    {
-        if (item.message_type() == ServerMessage::RESPONSE) {
-            lastResponseCode = item.response().response_code();
-        }
-    }
-
-    Response::ResponseCode
-    processExtendedModeratorCommand(int cmdType, const ModeratorCommand &, ResponseContainer &) override
-    {
-        ++dispatchCount;
-        // Fail closed for anything not explicitly handled.
-        if (cmdType != ModeratorCommand::REPORT_REOPEN) {
-            return Response::RespFunctionNotAllowed;
-        }
-        return Response::RespOk;
-    }
-};
-
-class ModeratorRoleTest : public ::testing::Test
-{
-protected:
-    Server server;
-    TestModeratorHandler handler{&server};
-
-    void setUserLevel(uint32_t level)
-    {
-        ServerInfo_User user;
-        user.set_user_level(level);
-        handler.setUserInfo(user);
-    }
-};
-
-TEST_F(ModeratorRoleTest, RejectsWhenNotLoggedIn)
-{
-    CommandContainer cont;
-    cont.add_moderator_command();
-    handler.processCommandContainer(cont);
-    EXPECT_EQ(handler.lastResponseCode, Response::RespLoginNeeded);
-    EXPECT_EQ(handler.dispatchCount, 0);
-}
-
-TEST_F(ModeratorRoleTest, RejectsPlainUser)
-{
-    setUserLevel(ServerInfo_User::IsUser | ServerInfo_User::IsRegistered);
-
-    CommandContainer cont;
-    cont.add_moderator_command();
-    handler.processCommandContainer(cont);
-    EXPECT_EQ(handler.lastResponseCode, Response::RespLoginNeeded);
-    EXPECT_EQ(handler.dispatchCount, 0);
-}
-
-TEST_F(ModeratorRoleTest, DispatchesToModeratorCommandForModerator)
-{
-    setUserLevel(ServerInfo_User::IsModerator);
-
-    CommandContainer cont;
-    ModeratorCommand *cmd = cont.add_moderator_command();
-    cmd->MutableExtension(Command_ReportReopen::ext);
-    handler.processCommandContainer(cont);
-    EXPECT_EQ(handler.lastResponseCode, Response::RespOk);
-    EXPECT_EQ(handler.dispatchCount, 1);
-}
-
-TEST_F(ModeratorRoleTest, DispatchesToModeratorCommandForAdmin)
-{
-    setUserLevel(ServerInfo_User::IsModerator | ServerInfo_User::IsAdmin);
-
-    CommandContainer cont;
-    ModeratorCommand *cmd = cont.add_moderator_command();
-    cmd->MutableExtension(Command_ReportReopen::ext);
-    handler.processCommandContainer(cont);
-    EXPECT_EQ(handler.lastResponseCode, Response::RespOk);
-    EXPECT_EQ(handler.dispatchCount, 1);
-}
-
-TEST_F(ModeratorRoleTest, RejectsDeveloperThatIsNotModerator)
-{
-    setUserLevel(ServerInfo_User::IsDeveloper);
-
-    CommandContainer cont;
-    cont.add_moderator_command();
-    handler.processCommandContainer(cont);
-    EXPECT_EQ(handler.lastResponseCode, Response::RespLoginNeeded);
-    EXPECT_EQ(handler.dispatchCount, 0);
-}
-
-TEST_F(ModeratorRoleTest, FailClosedForUnknownModeratorCommand)
-{
-    setUserLevel(ServerInfo_User::IsModerator);
-
-    CommandContainer cont;
-    cont.add_moderator_command(); // no extension set -> getPbExtension() returns -1
-    handler.processCommandContainer(cont);
-    EXPECT_EQ(handler.lastResponseCode, Response::RespFunctionNotAllowed);
-    EXPECT_EQ(handler.dispatchCount, 1);
-}
-
-} // namespace
-
-int main(int argc, char **argv)
-{
-    ::testing::InitGoogleTest(&argc, argv);
-    return RUN_ALL_TESTS();
-}
diff --git a/tests/server_rate_limiter_test.cpp b/tests/server_rate_limiter_test.cpp
index 8459c9690..bc15ca421 100644
--- a/tests/server_rate_limiter_test.cpp
+++ b/tests/server_rate_limiter_test.cpp
@@ -1,11 +1,7 @@
 #include "gtest/gtest.h"
 #include <QDateTime>
-#include <QString>
 #include <QTimeZone>
-#include <QtGlobal>
-#include <compare>
 #include <libcockatrice/utility/server_rate_limiter.h>
-#include <string>
 
 namespace
 {
diff --git a/tests/settings/CMakeLists.txt b/tests/settings/CMakeLists.txt
index 98bed1f4b..7ee32a645 100644
--- a/tests/settings/CMakeLists.txt
+++ b/tests/settings/CMakeLists.txt
@@ -1,14 +1,26 @@
-cockatrice_add_test(NAME settings_manager_test SOURCES settings_manager_test.cpp LIBS libcockatrice_settings)
+add_executable(settings_manager_test settings_manager_test.cpp)
+add_executable(settings_defaults_test settings_defaults_test.cpp)
+add_executable(settings_migration_test settings_migration_test.cpp)
 
-cockatrice_add_test(
-  NAME
-  settings_defaults_test
-  SOURCES
-  settings_defaults_test.cpp
-  LIBS
-  libcockatrice_settings
-  DEFINITIONS
-  SETTINGS_UNIT_TEST
+target_link_libraries(
+  settings_manager_test libcockatrice_settings Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES}
 )
 
-cockatrice_add_test(NAME settings_migration_test SOURCES settings_migration_test.cpp LIBS libcockatrice_settings)
+target_link_libraries(
+  settings_defaults_test libcockatrice_settings Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES}
+)
+target_compile_definitions(settings_defaults_test PRIVATE SETTINGS_UNIT_TEST)
+
+target_link_libraries(
+  settings_migration_test libcockatrice_settings Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES}
+)
+
+add_test(NAME settings_manager_test COMMAND settings_manager_test)
+add_test(NAME settings_defaults_test COMMAND settings_defaults_test)
+add_test(NAME settings_migration_test COMMAND settings_migration_test)
+
+if(NOT GTEST_FOUND)
+  add_dependencies(settings_manager_test gtest)
+  add_dependencies(settings_defaults_test gtest)
+  add_dependencies(settings_migration_test gtest)
+endif()
diff --git a/tests/settings/settings_defaults_test.cpp b/tests/settings/settings_defaults_test.cpp
index 2ba9f3fbb..379f6cd84 100644
--- a/tests/settings/settings_defaults_test.cpp
+++ b/tests/settings/settings_defaults_test.cpp
@@ -1,11 +1,5 @@
-#include "libcockatrice/card/card_localization.h"
-
 #include "gtest/gtest.h"
-#include <QDir>
-#include <QHash>
-#include <QList>
-#include <QString>
-#include <QStringList>
+#include <QSettings>
 #include <QTemporaryDir>
 #include <libcockatrice/settings/appearance_settings.h>
 #include <libcockatrice/settings/cache_storage_settings.h>
@@ -16,14 +10,11 @@
 #include <libcockatrice/settings/game_settings.h>
 #include <libcockatrice/settings/interface_settings.h>
 #include <libcockatrice/settings/network_settings.h>
-#include <libcockatrice/settings/paths_settings.h>
 #include <libcockatrice/settings/personal_settings.h>
 #include <libcockatrice/settings/sound_settings.h>
 #include <libcockatrice/settings/tabs_settings.h>
 #include <libcockatrice/settings/updates_settings.h>
 #include <libcockatrice/settings/visual_deck_storage_settings.h>
-#include <string>
-#include <utility>
 
 namespace
 {
@@ -168,12 +159,6 @@ TEST_F(SettingsDefaultsTest, Updates_NotifyAboutNewVersion_Default)
     ASSERT_EQ(s.getNotifyAboutNewVersion(), true);
 }
 
-TEST_F(SettingsDefaultsTest, Updates_CardDatabaseUpdateTrayNotification_Default)
-{
-    UpdatesSettings s(settingsPath, nullptr);
-    ASSERT_EQ(s.getCardDatabaseUpdateTrayNotification(), true);
-}
-
 TEST_F(SettingsDefaultsTest, Updates_UpdateReleaseChannelIndex_Default)
 {
     UpdatesSettings s(settingsPath, nullptr);
@@ -697,55 +682,6 @@ TEST_F(SettingsDefaultsTest, VisualDeckStorage_ShowUploadTime_SetAndGet)
     ASSERT_EQ(s.getVisualDeckStorageShowUploadTime(), false);
 }
 
-TEST_F(SettingsDefaultsTest, Paths_AppDirWarningAcknowledged_Default)
-{
-    PathsSettings s(settingsPath, nullptr);
-    ASSERT_EQ(s.getAppDirWarningAcknowledged(), false);
-}
-
-TEST_F(SettingsDefaultsTest, Paths_AppDirWarningAcknowledged_SetAndGet)
-{
-    PathsSettings s(settingsPath, nullptr);
-    s.setAppDirWarningAcknowledged(true);
-    ASSERT_EQ(s.getAppDirWarningAcknowledged(), true);
-}
-
-TEST_F(SettingsDefaultsTest, Paths_PathsInsideDir_DetectsNestedAndIgnoresSiblings)
-{
-    PathsSettings s(settingsPath, nullptr);
-    const QString base = QDir::cleanPath(settingsPath);
-
-    s.setDeckPath(base + "/decks/");
-    s.setPicsPath(base + "/pics");
-    s.setReplaysPath(base + "2"); // sibling sharing the name prefix, not nested
-
-    const QStringList offenders = s.pathsInsideDir(base);
-    ASSERT_EQ(offenders.size(), 2);
-    ASSERT_TRUE(offenders.contains(base + "/decks"));
-    ASSERT_TRUE(offenders.contains(base + "/pics"));
-}
-
-TEST_F(SettingsDefaultsTest, Paths_PathsInsideDir_EmptyWhenNothingMatches)
-{
-    PathsSettings s(settingsPath, nullptr);
-    s.setDeckPath("/somewhere/else/decks");
-    ASSERT_TRUE(s.pathsInsideDir(QDir::cleanPath(settingsPath)).isEmpty());
-}
-
-TEST_F(SettingsDefaultsTest, Paths_PathsInsideDir_MatchesExactBaseAndNormalizesDots)
-{
-    PathsSettings s(settingsPath, nullptr);
-    const QString base = QDir::cleanPath(settingsPath);
-
-    s.setCustomPicsPath(base);                // exactly the base directory
-    s.setThemesPath(base + "/pics/../decks"); // needs cleanPath normalization
-
-    const QStringList offenders = s.pathsInsideDir(base);
-    ASSERT_EQ(offenders.size(), 2);
-    ASSERT_TRUE(offenders.contains(base));
-    ASSERT_TRUE(offenders.contains(base + "/decks"));
-}
-
 } // namespace
 
 int main(int argc, char **argv)
diff --git a/tests/settings/settings_manager_test.cpp b/tests/settings/settings_manager_test.cpp
index 23d27aa78..51eb66dbb 100644
--- a/tests/settings/settings_manager_test.cpp
+++ b/tests/settings/settings_manager_test.cpp
@@ -1,11 +1,7 @@
 #include "gtest/gtest.h"
 #include <QSettings>
-#include <QString>
 #include <QTemporaryDir>
-#include <QVariant>
-#include <functional>
 #include <libcockatrice/settings/settings_manager.h>
-#include <string>
 
 namespace
 {
diff --git a/tests/settings/settings_migration_test.cpp b/tests/settings/settings_migration_test.cpp
index 2c4dcf7a9..84b948d2e 100644
--- a/tests/settings/settings_migration_test.cpp
+++ b/tests/settings/settings_migration_test.cpp
@@ -1,24 +1,13 @@
 #include "gtest/gtest.h"
-#include <QByteArray>
-#include <QByteArrayView>
-#include <QChar>
 #include <QColor>
 #include <QCoreApplication>
 #include <QDate>
 #include <QDir>
 #include <QFile>
-#include <QIODevice>
-#include <QList>
 #include <QSettings>
-#include <QString>
 #include <QStringList>
-#include <QStringLiteral>
 #include <QTemporaryDir>
-#include <QVariant>
-#include <QtGlobal>
 #include <libcockatrice/settings/settings_migration.h>
-#include <qnamespace.h>
-#include <string>
 
 namespace
 {
@@ -236,6 +225,7 @@ TEST_F(SettingsMigrationTest, MigratesAllSettingsGroups)
         g.setValue("cards/roundcardcorners", false);
         g.setValue("cards/overrideallcardartwithpersonalpreference", true);
         g.setValue("cards/bumpsetswithcardsindecktotop", false);
+        g.setValue("cards/includerebalancedcards", false);
         g.setValue("cards/autorotatesidewayslayoutcards", false);
         g.setValue("cards/tapanimation", true);
         g.setValue("cards/scaleCards", false);
@@ -394,6 +384,7 @@ TEST_F(SettingsMigrationTest, MigratesAllSettingsGroups)
     ASSERT_EQ(readFromIni("cards_display.ini", "cards/roundCardCorners"), QVariant(false));
     ASSERT_EQ(readFromIni("cards_display.ini", "cards/overrideAllCardArtWithPersonalPreference"), QVariant(true));
     ASSERT_EQ(readFromIni("cards_display.ini", "cards/bumpSetsWithCardsInDeckToTop"), QVariant(false));
+    ASSERT_EQ(readFromIni("cards_display.ini", "cards/includerebalancedcards"), QVariant(false));
     ASSERT_EQ(readFromIni("cards_display.ini", "cards/autoRotateSidewaysLayoutCards"), QVariant(false));
     ASSERT_EQ(readFromIni("cards_display.ini", "cards/tapAnimation"), QVariant(true));
     ASSERT_EQ(readFromIni("cards_display.ini", "cards/scaleCards"), QVariant(false));
@@ -705,71 +696,6 @@ TEST_F(SettingsMigrationTest, LegacyMigrationCamelCasesKeys)
     ASSERT_EQ(readFromIni("gamefilters.ini", "filter_games/gameType/deadbeef"), QVariant(true));
 }
 
-TEST_F(SettingsMigrationTest, LegacyMigrationMapsCreatorNameFilterToHostNameFilter)
-{
-    {
-        QSettings nativeSettings;
-        nativeSettings.setValue("filter_games/creator_name_filter", QStringList({"Alice", "Bob"}));
-        nativeSettings.sync();
-    }
-
-    ASSERT_TRUE(SettingsMigration::migrateLegacySettings(settingsPath));
-
-    ASSERT_TRUE(fileExists("gamefilters.ini"));
-    ASSERT_EQ(readFromIni("gamefilters.ini", "filter_games/hostNameFilter"), QVariant(QStringList({"Alice", "Bob"})));
-}
-
-TEST_F(SettingsMigrationTest, GameFiltersIniSnakeCaseMigratesToCamelCase)
-{
-    {
-        QSettings filtersIni(settingsPath + "gamefilters.ini", QSettings::IniFormat);
-        filtersIni.setValue("filter_games/hide_full_games", true);
-        filtersIni.setValue("filter_games/hide_games_that_started", true);
-        filtersIni.setValue("filter_games/game_name_filter", "test game");
-        filtersIni.setValue("filter_games/creator_name_filter", QStringList({"Alice"}));
-        filtersIni.setValue("filter_games/game_type/deadbeef", true);
-        filtersIni.sync();
-    }
-
-    ASSERT_TRUE(SettingsMigration::migrateGameFiltersToCamelCase(settingsPath));
-
-    ASSERT_EQ(readFromIni("gamefilters.ini", "filter_games/hideFullGames"), QVariant(true));
-    ASSERT_EQ(readFromIni("gamefilters.ini", "filter_games/hideGamesThatStarted"), QVariant(true));
-    ASSERT_EQ(readFromIni("gamefilters.ini", "filter_games/gameNameFilter"), QVariant("test game"));
-    ASSERT_EQ(readFromIni("gamefilters.ini", "filter_games/hostNameFilter"), QVariant(QStringList({"Alice"})));
-    ASSERT_EQ(readFromIni("gamefilters.ini", "filter_games/gameType/deadbeef"), QVariant(true));
-
-    // Idempotent: a second run has nothing left to do
-    ASSERT_FALSE(SettingsMigration::migrateGameFiltersToCamelCase(settingsPath));
-}
-
-TEST_F(SettingsMigrationTest, GameFiltersIniOrphanCreatorNameFilterMigratesToHostName)
-{
-    {
-        QSettings filtersIni(settingsPath + "gamefilters.ini", QSettings::IniFormat);
-        filtersIni.setValue("filter_games/creatorNameFilter", QStringList({"Alice"}));
-        filtersIni.sync();
-    }
-
-    ASSERT_TRUE(SettingsMigration::migrateGameFiltersToCamelCase(settingsPath));
-    ASSERT_EQ(readFromIni("gamefilters.ini", "filter_games/hostNameFilter"), QVariant(QStringList({"Alice"})));
-    ASSERT_FALSE(SettingsMigration::migrateGameFiltersToCamelCase(settingsPath));
-}
-
-TEST_F(SettingsMigrationTest, GameFiltersIniKeepsNewerCamelCaseValues)
-{
-    {
-        QSettings filtersIni(settingsPath + "gamefilters.ini", QSettings::IniFormat);
-        filtersIni.setValue("filter_games/hide_full_games", true);
-        filtersIni.setValue("filter_games/hideFullGames", false);
-        filtersIni.sync();
-    }
-
-    // Nothing to do: the current-format key already exists and must win
-    ASSERT_FALSE(SettingsMigration::migrateGameFiltersToCamelCase(settingsPath));
-    ASSERT_EQ(readFromIni("gamefilters.ini", "filter_games/hideFullGames"), QVariant(false));
-}
-
 TEST_F(SettingsMigrationTest, LegacyMigrationEmptyNativeFormatWritesSentinel)
 {
     QSettings().clear();
diff --git a/tests/single_instance_manager_test.cpp b/tests/single_instance_manager_test.cpp
index bc8074580..49193850d 100644
--- a/tests/single_instance_manager_test.cpp
+++ b/tests/single_instance_manager_test.cpp
@@ -1,18 +1,12 @@
 #include "single_instance_manager.h"
 
-#include <QByteArray>
 #include <QCoreApplication>
 #include <QDataStream>
 #include <QEventLoop>
-#include <QIODevice>
-#include <QList>
 #include <QLocalServer>
 #include <QLocalSocket>
-#include <QStringLiteral>
 #include <QTimer>
-#include <QtGlobal>
 #include <gtest/gtest.h>
-#include <string>
 
 namespace
 {
diff --git a/tests/test_age_formatting.cpp b/tests/test_age_formatting.cpp
index 8602ffdc0..6a9d5d4af 100644
--- a/tests/test_age_formatting.cpp
+++ b/tests/test_age_formatting.cpp
@@ -1,8 +1,5 @@
 #include "gtest/gtest.h"
-#include <QDate>
-#include <QPair>
 #include <libcockatrice/utility/days_years_between.h>
-#include <string>
 
 namespace
 {
diff --git a/tests/theme_migration/CMakeLists.txt b/tests/theme_migration/CMakeLists.txt
index 93493ee5f..ac202210e 100644
--- a/tests/theme_migration/CMakeLists.txt
+++ b/tests/theme_migration/CMakeLists.txt
@@ -1,7 +1,5 @@
-cockatrice_add_test(
-  NAME
+add_executable(
   theme_migration_test
-  SOURCES
   ${CMAKE_SOURCE_DIR}/cockatrice/src/interface/theme_manager.cpp
   ${CMAKE_SOURCE_DIR}/cockatrice/src/interface/theme_config.cpp
   ${CMAKE_SOURCE_DIR}/cockatrice/src/interface/pixel_map_generator.cpp
@@ -11,11 +9,22 @@ cockatrice_add_test(
   ${CMAKE_SOURCE_DIR}/cockatrice/src/client/network/update/client/release_channel.cpp
   ${VERSION_STRING_CPP}
   theme_migration_test.cpp
-  LIBS
+)
+target_include_directories(theme_migration_test PRIVATE ${CMAKE_SOURCE_DIR}/cockatrice/src)
+
+target_link_libraries(
+  theme_migration_test
   libcockatrice_settings
   libcockatrice_network
   libcockatrice_network_server_remote
   libcockatrice_protocol
-  INCLUDE_DIRS
-  ${CMAKE_SOURCE_DIR}/cockatrice/src
+  Threads::Threads
+  ${GTEST_BOTH_LIBRARIES}
+  ${TEST_QT_MODULES}
 )
+
+add_test(NAME theme_migration_test COMMAND theme_migration_test)
+
+if(NOT GTEST_FOUND)
+  add_dependencies(theme_migration_test gtest)
+endif()
diff --git a/tests/theme_migration/theme_migration_test.cpp b/tests/theme_migration/theme_migration_test.cpp
index d77c2f62d..147833630 100644
--- a/tests/theme_migration/theme_migration_test.cpp
+++ b/tests/theme_migration/theme_migration_test.cpp
@@ -1,15 +1,11 @@
 #include "interface/theme_manager.h"
 
-#include <QByteArray>
 #include <QDir>
 #include <QFile>
 #include <QFileInfo>
-#include <QIODevice>
 #include <QString>
-#include <QStringLiteral>
 #include <QTemporaryDir>
 #include <gtest/gtest.h>
-#include <string>
 
 // Owned by main.cpp in the real application; pixel_map_generator.cpp references
 // it, so the test binary needs a definition even though it never renders.
diff --git a/tests/translation_loader_test.cpp b/tests/translation_loader_test.cpp
index 745cd04bc..d54001ad3 100644
--- a/tests/translation_loader_test.cpp
+++ b/tests/translation_loader_test.cpp
@@ -1,17 +1,12 @@
 #include "gtest/gtest.h"
-#include <QByteArray>
 #include <QCoreApplication>
 #include <QDir>
 #include <QLibraryInfo>
-#include <QList>
 #include <QSet>
 #include <QString>
-#include <QStringList>
-#include <QStringLiteral>
 #include <QTemporaryDir>
 #include <QTranslator>
 #include <libcockatrice/utility/translation_loader.h>
-#include <string>
 
 // The directory holding translation_loader_test_de.qm, compiled from translation_loader_test.ts by the
 // build. QTranslator rejects anything that is not a real .qm file, so a stub cannot stand in here.
diff --git a/tests/warning_categories_test.cpp b/tests/warning_categories_test.cpp
index 549c373b5..432885dd9 100644
--- a/tests/warning_categories_test.cpp
+++ b/tests/warning_categories_test.cpp
@@ -1,8 +1,6 @@
 #include "gtest/gtest.h"
-#include <QList>
 #include <QString>
 #include <libcockatrice/utility/warning_categories.h>
-#include <string>
 
 TEST(WarningCategoriesTest, EmptyValueYieldsNoCategories)
 {
diff --git a/tools/generate_qt_mappings.py b/tools/generate_qt_mappings.py
deleted file mode 100755
index 42836b6da..000000000
--- a/tools/generate_qt_mappings.py
+++ /dev/null
@@ -1,208 +0,0 @@
-#!/usr/bin/env python3
-"""Generate an include-what-you-use mapping file for Qt 6 headers.
-
-Qt 6 ships a capital forwarding header (e.g. <QWidget>) for each lowercase
-private header (e.g. qwidget.h). include-what-you-use resolves symbols to the
-lowercase header by default, so this script emits a mapping that makes IWYU
-prefer the canonical capital includes, mirroring the qt5_11.imp bundled with
-IWYU but adapted to the Qt 6 module layout.
-
-For every capital header that forwards to exactly one lowercase header:
-
-* a "symbol" mapping is emitted so IWYU suggests <QClass> when the definition
-  of a class is needed, and
-* an "include" mapping is emitted so a literal `#include <qclass.h>` in source
-  is rewritten to its canonical capital header.
-
-A lowercase header can be forwarded to by several capital headers (e.g.
-qevent.h provides QCloseEvent, QMouseEvent, ...). In that case the include
-mapping targets the primary class, i.e. the capital header whose lowercased
-name equals the private header (QWidget for qwidget.h); headers with no such
-primary (aggregates like qevent.h) get no include mapping and are left alone.
-
-Usage:
-    tools/generate_qt_mappings.py [QT_INSTALL_HEADERS]
-
-QT_INSTALL_HEADERS defaults to `qmake6 -query QT_INSTALL_HEADERS` (falling back
-to common locations). The mapping is written to stdout.
-"""
-
-import argparse
-import os
-import re
-import subprocess
-import sys
-
-INCLUDE_RE = re.compile(r'^\s*#include\s*<\s*Qt[A-Za-z0-9_]+/+\s*([^>\s]+)>')
-CAPITAL_NAME_RE = re.compile(r'^Q[A-Za-z0-9_]+$')
-PRIVATE_NAME_RE = re.compile(r'^q[a-z0-9_]+\.h$')
-
-# Private Qt headers whose public spelling has to be named explicitly. Keep an
-# entry here only if the target header exists in every Qt we support; IWYU would
-# otherwise keep suggesting the private lowercase include, which is correct only
-# for headers that have shipped publicly since Qt 5.
-PORTABLE_WRAPPERS = {
-    # Qt 6.5 split the declarations that used to live in qglobal.h out into
-    # separate headers, under both a QtFoo wrapper and a qfoo.h private name.
-    # Neither spelling exists on the oldest Qt we support (6.4.2), and qtypes.h
-    # itself only appeared in Qt 6.9, so all of them are hard compile errors
-    # there. QtGlobal has been public since Qt 5, defines these declarations
-    # itself up to Qt 6.4, and includes the split headers from Qt 6.5 on, so it
-    # is the one spelling that resolves across the whole supported range.
-    'qtypes.h': 'QtGlobal',
-    'qtpreprocessorsupport.h': 'QtGlobal',
-    'qtversionchecks.h': 'QtGlobal',
-    'qassert.h': 'QtGlobal',
-    'qminmax.h': 'QtGlobal',
-    'qtclasshelpermacros.h': 'QtGlobal',
-    'qtenvironmentvariables.h': 'QtGlobal',
-    'qttranslation.h': 'QtGlobal',
-    'qoverload.h': 'QtGlobal',
-}
-
-
-def run_or_empty(cmd):
-    try:
-        return subprocess.run(cmd, capture_output=True, text=True,
-                              check=True).stdout.strip()
-    except (OSError, subprocess.CalledProcessError):
-        return ''
-
-
-def default_qt_headers_dir():
-    for cmd in (['qmake6', '-query', 'QT_INSTALL_HEADERS'],
-                ['qmake', '-query', 'QT_INSTALL_HEADERS']):
-        path = run_or_empty(cmd)
-        if path:
-            return path
-    for path in ('/usr/include/qt6', '/usr/lib64/qt6/include',
-                 '/usr/local/include/qt6'):
-        if os.path.isdir(path):
-            return path
-    return ''
-
-
-def collect_mappings(qt_headers_dir):
-    forwarders = {}  # (module_dir, private) -> [capital names]
-    symbols = {}     # capital name -> (module_dir, private)
-    for entry in sorted(os.listdir(qt_headers_dir)):
-        module_dir = os.path.join(qt_headers_dir, entry)
-        if not entry.startswith('Qt') or not os.path.isdir(module_dir):
-            continue
-        for name in sorted(os.listdir(module_dir)):
-            path = os.path.join(module_dir, name)
-            if not os.path.isfile(path) or not CAPITAL_NAME_RE.match(name):
-                continue
-            forwarded = []
-            with open(path, 'r', encoding='utf-8', errors='replace') as f:
-                for line in f:
-                    match = INCLUDE_RE.match(line)
-                    if match:
-                        forwarded.append(match.group(1))
-                        if len(forwarded) > 1:
-                            break
-            if len(forwarded) != 1:
-                continue
-            private = forwarded[0]
-            if not PRIVATE_NAME_RE.match(private):
-                continue
-            forwarders.setdefault((module_dir, private), []).append(name)
-            symbols[name] = (module_dir, private)
-    return forwarders, symbols
-
-
-def primary_include_mappings(forwarders):
-    mappings = {}
-    for (module_dir, private), names in sorted(forwarders.items()):
-        # Curated overrides win over the name rule below. They exist to redirect
-        # an include to a header that is valid across our whole supported Qt
-        # range, which the name rule cannot know about because it is generated
-        # from whatever Qt happens to be installed.
-        curated = PORTABLE_WRAPPERS.get(private)
-        if curated is not None:
-            mappings[(module_dir, private)] = curated
-            continue
-        # Prefer the forwarder whose name mirrors the private header
-        # (QAbstractAnimation -> qabstractanimation.h).
-        primary = next((n for n in names if n.lower() + '.h' == private), None)
-        if primary is not None:
-            mappings[(module_dir, private)] = primary
-    return mappings
-
-
-def main():
-    parser = argparse.ArgumentParser(description=__doc__)
-    parser.add_argument('qt_headers_dir', nargs='?', default=None,
-                        help='Qt 6 headers dir (default: qmake query)')
-    args = parser.parse_args()
-
-    qt_headers_dir = args.qt_headers_dir or default_qt_headers_dir()
-    if not qt_headers_dir or not os.path.isdir(qt_headers_dir):
-        sys.stderr.write('error: could not locate Qt headers, pass the include '
-                         'dir\n')
-        return 1
-
-    forwarders, symbols = collect_mappings(qt_headers_dir)
-    includes = primary_include_mappings(forwarders)
-
-    # A curated key that matches nothing is almost always a typo, and it fails
-    # silently: the entry just falls back to the name rule and emits the
-    # version-incompatible wrapper the override was meant to prevent.
-    known_private = {private for (_module_dir, private) in forwarders}
-    unknown = sorted(set(PORTABLE_WRAPPERS) - known_private)
-    if unknown:
-        sys.stderr.write('error: PORTABLE_WRAPPERS keys not found in the Qt '
-                         'headers: %s\n' % ', '.join(unknown))
-        return 1
-
-    entries = []
-    # Headers we redirect in PORTABLE_WRAPPERS do not exist on the oldest
-    # supported Qt, so do not advertise them as the home of a symbol either.
-    redirected = {name
-                  for (module_dir, private), names in forwarders.items()
-                  if private in PORTABLE_WRAPPERS
-                  for name in names}
-    for name in sorted(symbols):
-        if name in redirected:
-            continue
-        entries.append(
-            f'  {{ "symbol": [ "{name}", "private", "<{name}>", "public"] }},')
-
-    # Free operators of QSharedPointer/QWeakPointer live in qsharedpointer.h.
-    # IWYU does not apply "include" mappings when *adding* an include for an
-    # operator or other non-class symbol, so map them to the canonical capital
-    # header explicitly. A use is only reported when the operator is not
-    # already covered by an included header, so this does not mis-attribute
-    # comparison operators of other types (which are provided by their own
-    # type headers).
-    for name in ('operator==', 'operator!=', 'operator<', 'operator<=',
-                 'operator>', 'operator>=', 'comparesEqual'):
-        entries.append(
-            f'  {{ "symbol": [ "{name}", "private", "<QSharedPointer>", "public"] }},')
-    for (module_dir, private), public in sorted(includes.items()):
-        module = os.path.basename(module_dir)
-        # IWYU's .imp tokenizer treats the value as a JSON-ish string:
-        # '\"' becomes a quote and '\\' becomes a backslash for the regex.
-        quoted = '\\"'  # \" -- a JSON-escaped double quote in the .imp file
-        dotted = re.escape(private).replace('\\', '\\\\')
-        pattern = ('@[' + quoted + '<](' + re.escape(module) + r'/)?' +
-                   dotted + '[' + quoted + '>]')
-        entries.append(
-            f'  {{ "include": [ "{pattern}", "private", "<{public}>", "public"] }},')
-
-    if not entries:
-        sys.stderr.write('error: no Qt header mappings found\n')
-        return 1
-
-    print(f'# Do not edit! Generated by {os.path.basename(__file__)} from')
-    print(f'# {qt_headers_dir}')
-    print('[')
-    for entry in entries[:-1]:
-        print(entry)
-    print(entries[-1].rstrip(','))
-    print(']')
-    return 0
-
-
-if __name__ == '__main__':
-    sys.exit(main())